Merge "SurfaceControlViewHost: Respond to API feedback" into rvc-dev