Fix topsheet tabs tray appearance when in multiselect mode

app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt

@@ -462,9 +462,15 @@ class TabTrayView(
                 if (multiselect) MULTISELECT_HANDLE_HEIGHT.dpToPx(displayMetrics) else NORMAL_HANDLE_HEIGHT.dpToPx(
                     displayMetrics
                 )
-            topMargin = if (multiselect) 0.dpToPx(displayMetrics) else NORMAL_TOP_MARGIN.dpToPx(
-                displayMetrics
-            )
+            if (container.context.settings().toolbarPosition == ToolbarPosition.TOP) {
+                topMargin = if (multiselect) 0.dpToPx(displayMetrics) else NORMAL_TOP_MARGIN.dpToPx(
+                    displayMetrics
+                )
+            } else {
+                bottomMargin = if (multiselect) 0.dpToPx(displayMetrics) else NORMAL_BOTTOM_MARGIN.dpToPx(
+                    displayMetrics
+                )
+            }
         }
 
         view.tab_wrapper.setChildWPercent(
@@ -574,6 +580,7 @@ class TabTrayView(
         private const val MULTISELECT_HANDLE_HEIGHT = 11
         private const val NORMAL_HANDLE_HEIGHT = 3
         private const val NORMAL_TOP_MARGIN = 8
+        private const val NORMAL_BOTTOM_MARGIN = 8
         private const val NORMAL_HANDLE_PERCENT_WIDTH = 0.1F
     }
 }

app/src/main/res/layout/component_tabstray.xml

@@ -4,7 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:mozac="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tab_wrapper"
     style="@style/BottomSheetModal"

app/src/main/res/layout/component_tabstray_bottom.xml

@@ -4,7 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:mozac="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tab_wrapper"
     style="@style/TopSheetModal"
@@ -43,7 +42,6 @@
         android:id="@+id/topBar"
         android:layout_width="match_parent"
         android:layout_height="80dp"
-        android:layout_marginBottom="5dp"
         android:background="@color/foundation_normal_theme"
         app:layout_constraintBottom_toTopOf="@id/handle">