5c76faa638
(cherry picked from commit 1d7c692e89)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt