Fix library bugs (#7648)

- Fix mixup in Action Menu
- Fix back action not clearing search

(cherry picked from commit db93d1da76ba453e5b499bab0d2482728014786f)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt

app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt

@@ -64,8 +64,8 @@ fun LibraryScreen(
                         onChangeCategoryClicked = onChangeCategoryClicked,
                         onMarkAsReadClicked = onMarkAsReadClicked,
                         onMarkAsUnreadClicked = onMarkAsUnreadClicked,
-                        onDownloadClicked = onDownloadClicked,
-                        onDeleteClicked = onDeleteClicked.takeIf { presenter.selection.none { it.source == LocalSource.ID } },
+                        onDownloadClicked = onDownloadClicked.takeIf { presenter.selection.none { it.source == LocalSource.ID } },
+                        onDeleteClicked = onDeleteClicked,
                         // SY -->
                         onClickCleanTitles = onClickCleanTitles.takeIf { presenter.showCleanTitles },
                         onClickMigrate = onClickMigrate,

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt

@@ -158,11 +158,17 @@ class LibraryController(
     }
 
     override fun handleBack(): Boolean {
-        if (presenter.selection.isNotEmpty()) {
+        return when {
+            presenter.selection.isNotEmpty() -> {
                 presenter.clearSelection()
-            return true
+                true
+            }
+            presenter.searchQuery != null -> {
+                presenter.searchQuery = null
+                true
+            }
+            else -> false
         }
-        return false
     }
 
     override fun onViewCreated(view: View) {