am 9468f800: Merge change 22086 into eclair

Merge commit '9468f8006d56789cb8912459dd3e899529995297'

* commit '9468f8006d56789cb8912459dd3e899529995297':
  Tweak the ContactsHeaderWidget to match the newest specs.