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