Merge "PBAP: Check column value isn't null when query contacts"