(cherry picked from commit cd91ea9b7723eec378bbbefd916d3da6407d685e) # Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/AppModule.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt # data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt # domain/src/main/java/tachiyomi/domain/history/model/HistoryWithRelations.kt