Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev