Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2