Merge "Delay notification vibration to synchronize with notif sound" into oc-dev