Merge pull request #17318 from agh1/aria-hidden-icon