The device remove fails unless we unmount first Upstream-commit: 41399ac005caa4de2dbb744e48f058f6a15e2d2b Component: engine