Merge "MetadataCrypt: fix timeout due to missing userdata dm device"