Merge "Provide a timeout for SurfaceControl" into rvc-dev