2ecd2bce51
(cherry picked from commit 3966a917ee)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt