Apply the changes from the core issue

Benji Fisherrequested to merge
issue/toolbar-3093378:3093378-use-aria-disclosure into 2.x

Closes #3093378

Merge request reports