Merge "Correct SurfaceControl matrix parameter names."