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