Merge "Move PreferenceGroupAdapter creation out of PreferenceScreen"