Merge "Avoid showing a11y numbers for media container" into main