Merge "Introduce SurfaceControl Builder API"