Merge "Revert "Adding tracing for workspace loading that never finishes"" into udc-dev