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