Merge "Pass in callsite of SurfaceControl constructor explicitly (1/3)"