d8ee654a65
(cherry picked from commit c741920ec0)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt