Merge \\\"Protect against crash in font size\\\" into nyc-dev am: 4b336099f1 am: bc1764f404

am: fd6dda9040

Change-Id: I8fbc8cf8487631ae53b0e0483b9fe29df98423d7

src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java

@@ -67,6 +67,7 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
      */
     @Override
     protected void commit() {
+        if (getContext() == null) return;
         final ContentResolver resolver = getContext().getContentResolver();
         Settings.System.putFloat(resolver, Settings.System.FONT_SCALE, mValues[mCurrentIndex]);
     }