703263246e
(cherry picked from commit caeab0a63b)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt