Merge "Support zoned device with dm-default-key"