Merge \"Protect against crash in font size\" into nyc-dev

am: 4b336099f1

Change-Id: Ia77306b83425ab46a33c6d8aa386adb5c52f3da5

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]);
     }