(cherry picked from commit f5c7aa1142eec366092722d6301af939f19ae970) # Conflicts: # app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ComposeController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt