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