7017b7b3ea
(cherry picked from commit 322d66d282)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt