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

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