Merge "Wait for dm device to be ready before format"