Merge "Move NotificationEntry.channel to a getter"