Merge "use android:textAppearanceListItem to replace Preference subhead"