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