Merge "Also use the notification's sound for the misc channel" into oc-dev