Merge change 22086 into eclair

* changes:
  Tweak the ContactsHeaderWidget to match the newest specs.