Merge "VR: Move VR HWC initialization in SurfaceFlingerView"