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