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