Merge "Allow QS details to scroll when the screen is really small" into nyc-dev

        android:layout_height="wrap_content"

        />

    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1">

        <FrameLayout

            android:id="@android:id/content"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />

            android:layout_height="wrap_content" />

    </ScrollView>

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