am f1159e6b: am 725a2ffe: Reconcile with jb-mr1-release - do not merge

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