09e5bcaec1
(cherry picked from commit 8ea05e852e)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 8ea05e852e)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt