(cherry picked from commit 681e9396b3f9baf9c6f0e66f596830c662dbadb9) # Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/setting/SortModeSetting.kt