Merge change Ifc9162c5 into eclair

* changes:
  Fix padding around QuickContactBadge in ContactHeaderWidget