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