Merge "Remove notification channels from history when they're deleted." into sc-dev