e6bb7ffa3d
(cherry picked from commit b5fb64b70e)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt