Merge pull request #8726 from leob2g/Bug_852361_Device_is_shut_down_when_battery_level_become_two_percents

Bug 852361 - [System] Device is shut down when battery level become two percents(cherry picked from commit a7f1e921c67d5d3d4e0afaa06aca79320784e806)
Bug 901512 - [Contacts] Unable to finish the linking process when there has been an error while retrieving the picture of FB contact
Bug 847032 - [email] IMAP only supports initially-SSL encrypted connections, STARTTLS upgrade not supported from unencrypted cleartext. r=asuth a=blocking-b2g=leo+
Conflicts:
	apps/email/js/cards/setup_manual_config.html
	apps/email/js/cards/setup_manual_config.js
	apps/email/js/mail-common.js
	apps/email/style/setup-cards.css
Merge pull request #12229 from asutherland/email-starttls-v1-train

Bug 847032 - [email] IMAP only supports initially-SSL encrypted connections, STARTTLS upgrade not supported from unencrypted cleartext. r=asuth a=blocking-b2g=leo+
Bug 916023 - Add Gaia functional tests. r=jgriffin
Bug 917374 - add __init__.py to tests/python/gaia-ui-tests/gaiatest/apps/bango/
Bug 917373 - Update permissions locator to fix test_settings_app_permissions. r=zcampbell
Merge pull request #12029 from lodr/bug-910018-data-usage-threshold

Bug 910018 - Lowering the data check threshold.
r=arcturus(cherry picked from commit 88275d6f6194c7d0d8c5bbe47c9fcd7b257635ba)
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
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.
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)
Bug 900399 - let maximum image pixel resolution customizable
Merge pull request #12390 from evelynhung/issue-900399-v1-train-2

Issue 900399 v1 train 2