[fenix] For https://github.com/mozilla-mobile/fenix/issues/6625 Fix back navigation in search mode from browser

app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt

@@ -226,20 +226,15 @@ class SearchFragment : Fragment(), BackHandler {
     override fun onPause() {
         super.onPause()
         toolbarView.view.clearFocus()
-        // clearing focus makes keyboard hidden after activity is resumed
-        awesomeBarView.isKeyboardDismissedProgrammatically = true
     }
 
     override fun onBackPressed(): Boolean {
         return when {
             qrFeature.onBackPressed() -> {
                 view?.searchScanButton?.isChecked = false
-                // set to true because keyboard is being dismissed when returning from qr scan
-                awesomeBarView.isKeyboardDismissedProgrammatically = true
                 toolbarView.view.requestFocus()
             }
-            !awesomeBarView.isKeyboardDismissedProgrammatically -> true
+            else -> awesomeBarView.isKeyboardDismissedProgrammatically
-            else -> false
         }
     }
 

app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt

@@ -188,7 +188,10 @@ class AwesomeBarView(
                         view.hideKeyboard()
                         isKeyboardDismissedProgrammatically = true
                     }
-                    RecyclerView.SCROLL_STATE_IDLE -> isKeyboardDismissedProgrammatically = false
+                    RecyclerView.SCROLL_STATE_IDLE -> {
+                        isKeyboardDismissedProgrammatically = false
+                        view.requestFocus()
+                    }
                 }
             }
         }