Merge "PBAP: Handle null contacts in the updateList"