Merge "Fix accessibility regression." into rvc-dev