(cherry picked from commit c2520bff12fc2a9c382b21f2beb82173958c23ff) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt