Merge "Add LocaleNotificaiton feature flag" into main