Merge "Rename the legacy notification channel" into oc-dev