🏡 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 9f45f2a450a961d1be1f46b1a36606e2a7d89462..405c59ae20b1b1e227f95a24147d11da8bcad845 100644
--- a/chrome/android/java/res/layout/bottom_control_container.xml
+++ b/chrome/android/java/res/layout/bottom_control_container.xml
@@ -19,6 +19,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"
@@ -27,11 +28,18 @@
                 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/toolbar_height_no_shadow"

[Theresa, 2017/03/14 16:29:43]

This will change to bottom_control_container_height after the pull handle CL
lands.

-                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"