Merge changes I22d799f8,I1bc14e7a into nyc-dev

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

src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java

@@ -77,6 +77,7 @@ public abstract class DeviceListPreferenceFragment extends
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setAnimationAllowed(true);
 
         mLocalManager = Utils.getLocalBtManager(getActivity());
         if (mLocalManager == null) {