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