Merge "Use an iterator in removeChannelNotifications rather than index." into sc-dev