Merge pull request #10658 from ian-liu/settings/Bug881985_do_not_update_language_button_and_description_in_Language_menu

Bug 881985 - [Settings] Do not update language button and description in Language menu, r=@fabi1cazenave(cherry picked from commit 0f6d59ee2868df0c3b88c88af881c121ae4cf623)

Conflicts:

	apps/settings/index.html
	apps/settings/js/settings.js
Merge pull request #10274 from evanxd/bug-879779

Bug 879779 - [MMS] [UX] Message thread. Adjust beggining of content when there's no phone/carrier banner in the layout(cherry picked from commit fa3a72ca5ee6638a99357abf5f5ced3acc3f6cdd)
Bug 884349 - [MMI] Use MMIResult for get IMEI. r=rik
(cherry picked from commit b4314d78e75355cdd2c1a9250f97344f402717d3)
Bug 879694 - (mmi-localization-cb) [MMI] Localization of Call Barring functionality. r=rik
(cherry picked from commit a82bd42efd76cbee5bdca741eeb691d5ebc7c9f6)
Bug 879685 - (mmi-localization-cw) [MMI] Localization of Call Waiting functionality. r=ferjm
(cherry picked from commit 6fb3fbd87edbbb1740a9755b75750ffb9aa982e8)
Merge pull request #10706 from lissyx/bug883341

Bug 883341 - Ensure that the 'pick' activity is valid for Contacts(cherry picked from commit 13c3bffc4fc1138175b60012b5459bc5d548e09c)
Bug 885259 - [SMS/MMS] Edit mode can be enabled while composing a message r=borjasalguero

As per the UI specification, the "Edit Mode" button should be available
while a message is being composed, but when Edit Mode is entered, the
Compose field should be completely hidden.
(cherry picked from commit 95e2583d41e3663f965f5935de3bb0f1c6210807)
Merge pull request #10716 from leob2g/Bug_888818_Missing_localization_default_media_location

Bug 888818 - [Settings] missing localization of default media location popup, r=kaze(cherry picked from commit 7b2c7297ca5b09830d986a04e9b682e151173ad2)
Merge pull request #10701 from punamdahiya/Bug_880888

Bug_880888-[Music]-Localize Close label in Music Search r=davidflanagan(cherry picked from commit 639a1fa2984918f6eabc28e290abdfe09005b9bc)