Fix potential races in the volume store Upstream-commit: cc207aa136fd5e01164d245de94fb900ca7212a2 Component: engine