Merge "Increase notification channel limit" into rvc-dev