If an image is deleted and there is a corresponding device for that image we also delete the image. Upstream-commit: 99393cf3cfd08de769f0c37f06b912fb3771a080 Component: engine