(cherry picked from commit 224fcada17f2bf02f2ec9057ff172f3b77b879cb) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
(cherry picked from commit 224fcada17f2bf02f2ec9057ff172f3b77b879cb) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt