Merge pull request #16951 from steveck-chung/Bug-976999

Bug 976999 - [Sora][Message][MMS]Some of the text content lost when forward the MMS. r=julienw
Conflicts:
	apps/sms/test/unit/compose_test.js
Merge pull request #16910 from gtorodelvalle/contacts-bug-972600-add-contact-after-merging

Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen (r=arcturus)