Merge change 25293 into eclair

* changes:
  Fix a handful of bugs in the ContactHeaderWidget