Merge "Track pending task info & if the task doesn't launch clean it up" into udc-dev