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