Merge changes Ia21f45c1,I208797f3

* changes:
  Check if notification is valid before it finally vibrates because it can be canceled as soon as enqeued
  Update sound/vibrate notification key only when it actually buzz/beep.