Fix implicit DeviceMapper selection Upstream-commit: f0ed68f852e33ed21420959790be4741725b03b1 Component: engine