Merge "Query speed up with "raw_contact_is_user_profile" check"