30fcd30da8
(cherry picked from commit 27bac4fffb)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt