am 3d8e66ab: (-s ours) am f1159e6b: am 725a2ffe: Reconcile with jb-mr1-release - do not merge

* commit '3d8e66ab764c7cec9bdf3bc99829eeef0d3e7dcb':
  When in vibrate mode, all notifications will vibrate.