Merge "Update dialog styling to comply with design guidelines" into sc-v2-dev