565fa58514
(cherry picked from commit 150ea29a70)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt