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