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