7b038951b0
(cherry picked from commit 03980b2f27)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt