Merge "[Shadow] Update the string and the dismiss button" into main