(cherry picked from commit 36f81b4a623ede11f10049f5869de5b6efa7803a) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
(cherry picked from commit 36f81b4a623ede11f10049f5869de5b6efa7803a) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt