(cherry picked from commit 7d8a865cac18ca307ef89768950a0835ebbb6f05) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 7d8a865cac18ca307ef89768950a0835ebbb6f05) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt