(cherry picked from commit a93c0577acdf9fdc591087838ecb5a004d3acf81) # 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