Merge "[a11y] Make dialog icon not important for accessibility" into sc-mainline-prod