b2ee3bf176
(cherry picked from commit 9de08c8166)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 9de08c8166)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt