Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5
am: b459013081

Change-Id: Ia1f769090c36578c61e9d7c9aac088558757dff1