Merge "Updating dismiss button icon to be rounded." into oc-dr1-dev