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