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