Merge "Update notification settings to match Notification Dot branding." into oc-dev