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