Merge "VR: Update VR HWC to use buffer metadata passed by SurfaceFlinger" into oc-dev