806b35d024
(cherry picked from commit f343131802)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt