Merge "Fix use after delete reference for device" into udc-dev