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