Merge "Fixing memory leak in PreferenceScreen." into honeycomb