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