Merge pull request #7394 from borjasalguero/bug_826085

[Bug 826085 ][B2G] [SMS] Contacts : SMS message deleted when choosing contact for sea...
[Bug 811539] [SMS] Delete PhoneNumberJS once will be available in Gecko r=julienw