Merge change 26301 into eclair

* changes:
  Add aggregated badge to ContactHeaderWidget