3077dc24ec
(cherry picked from commit 1237af1ff3)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt