Merge changes Ia9502056,I97dc60c4 into nyc-dev

* changes:
  Fixed the group expand motion to better reflect the overflow
  Introduced a number indicating more children in a group