The device remove fails unless we unmount first Upstream-commit: 6f57e8025a0a03da8052edc30157f7677f65f208 Component: engine