(cherry picked from commit a3f1b721269b421dde67b8fd4e7017cf6c891c06) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
(cherry picked from commit a3f1b721269b421dde67b8fd4e7017cf6c891c06) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt