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