Merge "SurfaceControl: Fix builder" into sc-dev