Merge "Fix Media Output a11y click action" into main