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