Merge "Correct issue where quick succession calls both get canceled." into udc-dev