Bug 935636 - Avoid duplicating data on contact merge
Merge pull request #19343 from michalbe/Bug935636

Bug 935636 - Avoid duplicating data on contact merge
Bug 1024295 - [bb][header] Missing images