Merge "Increase test coverage for NotificationChannel" into rvc-dev