(cherry picked from commit b6b78994d8203a94f27d8a834bcb31d2f898d44a) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
(cherry picked from commit b6b78994d8203a94f27d8a834bcb31d2f898d44a) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt