🏡 Show correct BottomSheetContent toolbar when contents swapped

chrome/android/java/res/layout/bottom_control_container.xml

Index: chrome/android/java/res/layout/bottom_control_container.xml
diff --git a/chrome/android/java/res/layout/bottom_control_container.xml b/chrome/android/java/res/layout/bottom_control_container.xml
index 2ff0eab1e9e6e3df334c9ea51dca35e028258b7b..ed74218dfa13a86beb853b88601a925be40132e1 100644
--- a/chrome/android/java/res/layout/bottom_control_container.xml
+++ b/chrome/android/java/res/layout/bottom_control_container.xml
@@ -20,6 +20,7 @@
             android:id="@+id/toolbar_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" >
+
             <ImageView
                 android:id="@+id/bottom_toolbar_shadow"
                 android:layout_width="match_parent"
@@ -28,11 +29,20 @@
                 android:scaleType="fitXY"
                 android:scaleY="-1"
                 android:contentDescription="@null" />
-            <ViewStub
-                android:id="@+id/toolbar_stub"
+
+            <FrameLayout
+                android:id="@+id/toolbar_holder"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_control_container_height"
-                android:layout_marginTop="@dimen/toolbar_shadow_height" />
+                android:layout_marginTop="@dimen/toolbar_shadow_height" >
+
+                <ViewStub
+                    android:id="@+id/toolbar_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+            </FrameLayout>
+
             <ViewStub
                 android:id="@+id/find_toolbar_stub"
                 android:inflatedId="@+id/find_toolbar"
@@ -40,6 +50,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_control_container_height"
                 android:layout="@layout/find_toolbar" />
+
             <ImageView
                 android:id="@+id/toolbar_handle"
                 android:layout_width="@dimen/toolbar_handle_width"