Merge "Make group expanding nicer" into nyc-dev
am: f045b5a61b

* commit 'f045b5a61bdf7a397aee8c1902b2a9e756ef5695':
  Make group expanding nicer