Merge pull request #11606 from lodr/bug-896848-missing-icchelper

Bug 896848 - Adding a missed ICCHelper
r=arcturus(cherry picked from commit f7764053863baef795ee1a3b3a3f9b13b50c52b7)
Revert "Merge pull request #11606 from lodr/bug-896848-missing-icchelper"

This reverts commit 6798a7fd8fbc6f154a38e3971ed278d0a05dfb40.
Bug 898261 - Remove mute icon from lock screen
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
Bug 909622 - [B2G][Helix][messages][zhaotao]Sending mms with attachment(chinese name mp3) fail - r=julienw

- Replace all non standard word characters in filenames with a # while encoding SMIL
- Remove HTML escaping in preference for replacing unsafe chars with the #
- Add unit test to ensure that quotes are always escaped

(cherry picked from commit c6625624dec07e2c875c8f3019b512f5ed2d076e)

Conflicts:
	apps/sms/js/smil.js