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

Change-Id: I31d05682f1a47f9b4a810750fb2a3d9023297ac2