a47e88a953
(cherry picked from commit 3319ccfd41)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 3319ccfd41)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt