Merge "Fix a11y issues." into rvc-dev