Merge "Improve jank on header change." into nyc-mr1-dev

            android:clickable="true"

            android:soundEffectsEnabled="false"

            android:src="@drawable/ic_volume_collapse_animation"

            android:background="@drawable/ripple_drawable"

            tools:ignore="RtlHardcoded"

            android:layout_alignParentEnd="true"

            android:layout_alignParentTop="true"

    android:id="@+id/volume_dialog_row"

    android:paddingEnd="@dimen/volume_dialog_padding_end"

    android:orientation="vertical"

    android:paddingBottom="@dimen/volume_row_padding_bottom" >

    android:paddingBottom="@dimen/volume_row_padding_bottom"

    android:animateLayoutChanges="true">

    <TextView

        android:id="@+id/volume_row_header"