8b8b377c29
(cherry picked from commit a2ece82197)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt