Merge "Treat mChannelCount as uint32_t consistently"