Merge "ueventd: Put dm-user devices in a folder"