475dc87604
(cherry picked from commit 98822a39d9)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt