Merge "Stop supporting System UID to embed a separate task" into tm-dev