(cherry picked from commit 30b3b2d3ffd5d90aee293e9ae22b3cb2a4924c2b) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/AppModule.kt # app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterPresenter.kt