Merge changes I6b52e378,I1699e6bf into nyc-dev

* changes:
  Phone call vibrate should obey user preference.
  Adjustment bundles are defusable.