(cherry picked from commit 5b09461ccf76963fef844d7550383205e8d33010) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
(cherry picked from commit 5b09461ccf76963fef844d7550383205e8d33010) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt