Merge "Fixes NPE with 3p entries in QuickContact"