743482dfd2
(cherry picked from commit 2b76a97989)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt