Merge "Increase number of lines before the fold to make sure Now Playing is visible." into pi-dev

    android:title="@string/sound_settings"

    android:key="sound_settings"

    settings:keywords="@string/keywords_sounds"

    settings:initialExpandedChildrenCount="8">

    settings:initialExpandedChildrenCount="9">

    <!-- Media volume -->

    <com.android.settings.notification.VolumeSeekBarPreference