Merge pull request #13354 from julienw/924475-master-fix

Bug 924475 - [Messages] The context menu is missing the contact name and...(cherry picked from commit 55977f034e24c9386af1c92a3eed53a92d901a33)

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