692e7e17d8
(cherry picked from commit eed6db8e92)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt