Merge pull request #20396 from steveck-chung/bug-994553

Bug 994553 - [Sora][Message][Contacts]Contacts's head portrait do not display in Message. r=julienw
Conflicts:
	apps/sms/test/unit/thread_list_ui_test.js