65249a4ee7
(cherry picked from commit 3854995ef2)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
# app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt