ea3f90f107
(cherry picked from commit 3bce07e873)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt