Merge "Cleanup notification channel slice" into rvc-dev