Merge "Notification sound field updates" into oc-dev