Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev