am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2

* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
  Stability fixes for PreferenceFragments.