Merge change 25294 into eclair

* changes:
  Adjust to new ContactHeaderWidget api.