3cf4c3128f
(cherry picked from commit 9e3b454b1b)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt