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