Merge "DO NOT MERGE - Validate notification-channel deletion semantics" into sc-dev