Merge "SurfaceControl: Correct setMatrix parameter naming."