Make use of deferred removal of devices. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Upstream-commit: e37c7203bb1d840e9383ac08bf87afda3e722344 Component: engine