Merge \\"Make sure to clear out preference cache when done\\" into nyc-mr1-dev am: 9b0931e986

am: d1a54dc62a

Change-Id: I07e1c9725cd6880d7b974e318959cb746ab014b4

src/com/android/settings/SettingsPreferenceFragment.java

@@ -392,10 +392,11 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
         for (Preference p : mPreferenceCache.values()) {
             group.removePreference(p);
         }
+        mPreferenceCache = null;
     }
 
     protected int getCachedCount() {
-        return mPreferenceCache.size();
+        return mPreferenceCache != null ? mPreferenceCache.size() : 0;
     }
 
     private void highlightPreference(String key) {