Merge "Use PhoneBase in the phone list." into gingerbread