Bug 1977765 - Show the microsurvey on top of the navbar r=android-reviewers,Roger

For now we're following the same flow as with the bottom toolbar.
A bigger refactoring to come later.

Differential Revision: https://phabricator.services.mozilla.com/D259087

Author: Mugurell

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt

@@ -1594,9 +1594,12 @@ abstract class BaseBrowserFragment :
         val isToolbarAtBottom = context.isToolbarAtBottom()
         val browserToolbar = (browserToolbarView as? BrowserToolbarView)?.toolbar
             ?: (browserToolbarView as BrowserToolbarComposable).layout
+        val navigationBar = browserNavigationBar?.layout
         // The toolbar view has already been added directly to the container.
         if (isToolbarAtBottom) {
             binding.browserLayout.removeView(browserToolbar)
+        } else if (navigationBar != null) {
+            binding.browserLayout.removeView(navigationBar)
         }
 
         _bottomToolbarContainerView = BottomToolbarContainerView(
@@ -1642,6 +1645,8 @@ abstract class BaseBrowserFragment :
 
                         if (isToolbarAtBottom) {
                             AndroidView(factory = { _ -> browserToolbar })
+                        } else if (navigationBar != null) {
+                            AndroidView(factory = { _ -> navigationBar })
                         }
                     }
                 }