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