Merge "Create independent mount path for each device"