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