9320221a4e
(cherry picked from commit a93c0577ac)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
# app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
# app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt