Merge "Fixing a flake when workspace loading never finishes." into udc-dev