
(cherry picked from commit d558f9e1d6bcc8eb8f69359e6e7516f7ea24a408) # Conflicts: # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
(cherry picked from commit d558f9e1d6bcc8eb8f69359e6e7516f7ea24a408) # Conflicts: # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt