22b8f51fa3
(cherry picked from commit ef5148ebb4)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt