aad0ac7296
(cherry picked from commit ccc0a61158)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/ForceCloseActivity.kt