a9317dff88
(cherry picked from commit fa5d2276c0)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt