Merge change 26461 into eclair

* changes:
  Remove the aggregate icon when it ceases to be an aggregate.