Merge "NOTIFICATION_GROUP_EXPANSION_CHANGE -> unreleased" into udc-qpr-dev