Merge "Notification Channel/Group changes"