Merge "Adding wait for a device file before mount"