Merge "support locale change for notification channel" into oc-dev