Merge commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0' * commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0': Fix a handful of bugs in the ContactHeaderWidget
Merge commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0' * commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0': Fix a handful of bugs in the ContactHeaderWidget