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