Merge "Updates Flash Notifications string resources" into udc-dev