Merge "Fix the VR virtual display height" into oc-dr1-dev