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