Merge changes I22d799f8,I1bc14e7a into nyc-dev

* changes:
  Guard against crash in dev options
  Switch to whitelist for animations

src/com/android/settings/DevelopmentSettings.java

@@ -1720,6 +1720,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         DialogInterface.OnDismissListener onDismissListener = new DialogInterface.OnDismissListener() {
             @Override
             public void onDismiss(DialogInterface dialog) {
+                if (getActivity() == null) {
+                    return;
+                }
                 updateAllOptions();
             }
         };