Merge "Fix broken behavior around ImportVCardActivity."