Merge "VR: Pass display size in the HWC observer callback" into oc-dev