828944950b
(cherry picked from commit b2d4e5ab84)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt