Merge pull request #12297 from julienw/917028-add-more-than-1-contact

Bug 917028 - [B2G][SMS] Compose an SMS: Unable to add more than one reci...(cherry picked from commit 7de288abc0993c69cd36daf0e0862710d21689ea)

Conflicts:
	apps/sms/js/thread_ui.js
	apps/sms/test/unit/thread_ui_test.js