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