Merge changes I116b5f63,I6fa7adaa

* changes:
  Remove isWide from MobileIconGroup
  Move callback anonymous classes out of constructor