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