
(cherry picked from commit 56fb4f62a152e87a71892aa68c78cac51a2c8596) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/RestoreOptions.kt