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