Merge "Remove FrameLayout around toolbar" into oc-dev

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:fitsSystemWindows="true">

        <FrameLayout

            style="?android:attr/actionBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:theme="?android:attr/actionBarTheme">

        <Toolbar

            android:id="@+id/action_bar"

            style="?android:attr/actionBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:theme="?android:attr/actionBarTheme"

            android:navigationContentDescription="@*android:string/action_bar_up_description"/>

        </FrameLayout>

        <FrameLayout

            android:id="@+id/content_header_container"

            style="?android:attr/actionBarStyle"