Merge "Fix crash on dismissal of an empty QuickContact"