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

am: bc1764f404

Change-Id: I0808298678eb25b603302c537ca8e9a667fae8bc

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