(cherry picked from commit 53decfd47b2fba53cebcaa2350fb8cf6a2385e9f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt # app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt