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