Merge "Camera: pass StreamSurfaceId instead of Surface"