Combined email and phone selection in ContactPicker and PhoneNumberPicker, since they're coming from the same place
Updated ContactPicker description