Merge "Make the doc for PreferenceScreen aware of PreferenceFragment."