Merge "Tweak refresh of notification channel group preferences" into udc-dev