Merge "Some more a11y fixes" into rvc-dev