(cherry picked from commit a4a4503311baacdef03c9bc3fc95c7ba1b0aea37) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
(cherry picked from commit a4a4503311baacdef03c9bc3fc95c7ba1b0aea37) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt