Merge "Reset notification when locale changes" into sc-dev