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