Merge "Fix some history a11y issues" into rvc-dev