Merge "AttachedSurfaceControl: Respond to API feedback." into sc-dev