Merge changes Ieb3493f2,Iff1926d2 into udc-qpr-dev

* changes:
  Only notify listeners when group expansion changes.
  Add flag for group expansion listener changes.