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

Change-Id: Ie83926b9cca629fb2d3e2ba2bbad9c1a13629db6