(cherry picked from commit b668364afbfdde9e91fda6621c80c96262c6492a) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt