Merge "Don't set the same viewId twice" into lmp-dev

    <!-- Shown only when an Account filter is set.

         - paddingTop should be here to show "shade" effect correctly. -->

    <!-- TODO: Remove the filter header. -->

    <include

        android:id="@+id/account_filter_header_container"

        layout="@layout/account_filter_header" />

    <include layout="@layout/account_filter_header" />

    <FrameLayout

        android:layout_width="match_parent"