Merge "Send notification state event more frequently" into oc-dev