5c2d07d14d
(cherry picked from commit 80b4b7bee6)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt