Merge "Enhance some UI tests" into rvc-dev