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