Merge "SurfaceControlViewHost: Add side-channel to SurfacePackage"