Merge "Misc fixes for notification" into oc-dev