Merge "Add badging support for channels."