Bug 857687 - Add L10N id for cancel button r=etienne
(cherry picked from commit 3ae01fd39341c97be953ac3bc5c5902ee9e6d6ed)
No bug. fix Settings > Display and Settings > Sound bustage. r=me
Merge pull request #8968 from pivanov/bug-845102

Bug 845102 - Search No Contacts Found Screen Updates r=samjoch(cherry picked from commit fe4bcf1666ac1ac2200bc57bf4d8bf65cfec6719)
Merge pull request #9248 from timdream/bug859201

Bug 859201 - Contacts app should not be using mozKeyboard API, r=@albertopq(cherry picked from commit 48415d26d6821bdadd4a43d7ccc2a87672cc0bdf)
Bug 864476 - [FTE] the progression bar should be hidden in some panels r=arcturus

Moved the className calculation before the switch-case so that we can override
it inside the switch-case.

Added a test case to prevent future regressions
(cherry picked from commit d172b22cd4992fef03d3a2facc64a9644b556e8a)
Merge pull request #9247 from KevinGrandon/bug_862752_alarm_translations

Bug 862752 - Extend pretty date helper(cherry picked from commit 913177e7a8c49cd6f1ebcc5843ec3f2df8901e68)
Merge pull request #9341 from lightsofapollo/leob2g-Bug_796588_Can_Add_multiple_same_account

Bug 796588 - Don't allow user to setup same account twice r=lightsofapol...(cherry picked from commit 802c5cfc24b00549570f7a6fc3167ef748bfec05)
Merge pull request #9390 from mozsquib/email-resolve-contacts

Bug 848266 - [email] Have MailAPI resolve e-mail addresses to contacts(cherry picked from commit acffeb126b7e852647b460bffdc67d80f1afb950)
Bug 857691 - Weird error message showed when checking Call Waiting status. r=arthurcc
(cherry picked from commit cfe6ee1865e5e3025a98d57c941d96cee22f231b)

Conflicts:
	apps/settings/js/call.js
Merge pull request #8669 from marcofreda527/bug-848597-proximity-v2

Bug 848597 - The timing of enabling Proximity sensor doesn't consider alerting state. r=timdream, a=tef+
Merge pull request #9232 from comoyo/short_numbers

Bug 856991 - Use equals to look up phone numbers in SMS app instead of contains. r=fernando.campo
Merge pull request #9357 from albertopq/contacts-fix-org-import-gmail

Bug 861934 - Contacts with only org should be shown in the list when importing from Gmail r=arcturus
Conflicts:
	apps/communications/gmail/test/unit/gmail_connector_test.js
Bug 835774 - [Building Blocks] [Filters] Left border should be removed
(cherry picked from commit 352ef946693d267d997b709fcc03537710289ec9)
Bug 834446 - [Browser] Truncated Bookmark Label

Conflicts:
	apps/browser/style/browser.css

(cherry picked from commit 63149e661d59b024aceb245d9085cfb29be2a42f)
Bug 862788 - [Settings] Outlook icon in "Import Contacts" (cherry picked from commit 1bcf8e45aeaf60adf0b5c3643b227396ae8f6793)
Bug 819593 - Keyboard flickers close then open when tapping from one input element to another r=vivien
(cherry picked from commit a91b91bf5ca82b8c78cc1e40bc5650708f29cc48)
Merge pull request #9358 from lodr/bug-864798-change-mnc-mcc-with-strings

Bug 864798 - Follow up of bug 845629 about updating MNC and MCC uses
Cause r+(cherry picked from commit 4461830f907e8f87ff13ddb31aabec4726530306)
Merge pull request #9345 from lodr/bug-864269-reset-low-balance-notification

Bug 864269 - Resetting notification each time the user changes the threshold
Cause r+(cherry picked from commit a49fc93f3d36c34b167a57d1da319ed5e9d0086f)
Merge pull request #9420 from albertopq/contacts-bug-only-org

Bug 864841 - Creating a contact with only "Company" doesn't work r=arcturus(cherry picked from commit e465d99917b72e16e4f6b4f1e7fdce7b84b152f9)
Bug 835193 - sleep time for preview of images and videos from filmstrip. r=daleharvey

updated code as per coding standards
updated as per naming convention
(cherry picked from commit a24785ad5efd220d14bfda8b4c6a48cb5d8a2e38)