Merge "support notification channel for non owner users" into oc-mr1-dev