Merge "Camera: pass stream/surface Id instead of Surface"