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