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
Merge pull request #11120 from leob2g/Bug_896848_Usage_App_Closing_When_Receive_a_Call

[CostControl] Bug_896848_Closing_Usage_app_after_call
r=lodr(cherry picked from commit 95cf971a1e0d1c0813279bd91200499ae706f761)
Bug 905889 - [Buri][PLMN]Network name will be shown twice.
Merge branch 'v1-train' into v1.1.0hd
Bug 917828 - Remove the phone number assert in /settings/test_settings_device_info.py
Merge pull request #12300 from teodosia/update-assert-device-info

Bug 917828 - Change the phone number assert in /settings/test_settings_device_info.py to assertIsNotNone in v1-train
Merge pull request #12245 from EverythingMe/bugfix-903405

[Bug 903405] [E.me][L10n] After changing language, the description in e.me should change [r=crdlc](cherry picked from commit b3d003e1c92f6bd685be275b57f17d186ffcaaa7)
Merge branch 'v1-train' into v1.1.0hd
Bug 900399 - let maximum image pixel resolution customizable
Merge pull request #12390 from evelynhung/issue-900399-v1-train-2

Issue 900399 v1 train 2
Bug 833660 - hide icon when calling addNotification without icon parameter

Conflicts:
	apps/system/js/notifications.js
Merge pull request #12421 from yurenju/wrong-notification-icon

Wrong notification icon r=@timdeam
Merge pull request #12385 from snowmantw/issue905889-v1train

Bug 905889 - [Buri][PLMN]Network name will be shown twice, r=timdream
Bug 920411 - When homescreen is in Edit mode I can still swipe right and go to the landing page
Merge branch 'v1-train' into v1.1.0hd
Merge pull request #12446 from crdlc/bug-920411

Bug 920411 - When homescreen is in Edit mode I can still swipe right and...
bug 920647 - add Italian to v1-train languages_dev.json
Merge pull request #12481 from escapewindow/v1-train

bug 920647 - add Italian to v1-train languages_dev.json r=pike
Bug 893358 - Italian keyboard layout support
(cherry picked from commit f060cde6d358580bb6d1b7661c03ca8a0f94ed7b)

Conflicts:

	apps/settings/index.html
	apps/settings/locales/settings.en-US.properties