f5a90d46ec
(cherry picked from commit fcde6c2b84)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt