Merge "Fix the exception type set on ui cancellation" into udc-dev