Merge "Don't send cancel after client finished" into udc-qpr-dev