Merge "Fix stage stay empty if close transition request before task vanished" into udc-dev