[DEV] Handle hot add/remove of device