Merge "Fixed the hard-coded dismiss button text"