Merge "SW RAID: Delete root device hint"