Merge "Fix callback test to only verify registration" into udc-dev