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