(cherry picked from commit 299e52e877d57cd912ac5dab2fe9c087c95ca350) # Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt