When selecting new contact for conversation, phone numbers of TYPE_CUSTOM now display the actual label in the options dialog rather than the word "Custom"