1992a2a4c4
(cherry picked from commit 80635343ae)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 80635343ae)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt