(cherry picked from commit 381ba86e3c84b5478a400bb492ba5b5d1306eb8d)
(cherry picked from commit 6ad3fcb91df3af7d923ccf8967da361502c47705)
(cherry picked from commit 0af81c7d05b408ff49f98bdab29ade69b21a6b5f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt