Merge "Fix a11y announcement of the Modes Dialog" into main