Merge "lvm: Extend multichannel support to 24 channels"