Merge "a11y for controls management" into rvc-dev