Merge "Fix deadlock caused by wrong locking order" into udc-dev