Merge "Update notification channels on locale change." into oc-dev