a284f5cd08
(cherry picked from commit 88032e11df)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt