Merge "Prevent double-closure of VirtualDeviceImpl" into udc-dev