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