Merge "Fixed a bug with the collapsed media template" into nyc-dev

        <LinearLayout

            android:id="@+id/media_actions"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom|end"

            android:layout_marginStart="10dp"

            android:layout_marginBottom="12dp"