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

Change-Id: I9c16c20b98220699cd422a4aeb0e6f088a0376f7