Merge "Notification vibration improvements:" into jb-mr1.1-dev