Merge "Fix VrDisplayTest failure" into rvc-qpr-dev