Merge "rename notification channel" into oc-mr1-dev