Bug 1033973 - Update device testing to marionette client 0.7.11 a=testonly
Bug 1027391 - SIM lock shows a transparent status bar
Bug 1030448 - Also make the default lockscreen react to the 'lockscreen.lock-immediately' setting.
Bug 1030546 - [Emergency Call] Import dialer.xxx.properties into emergency call app to fix cancel button. r=etienne
Bug 1032502 - [Callscreen] Import contacts.xxx.properties l10n files into Callscreen to fix phone type label. r=etienne
Merge pull request #21164 from acperez/bug-1022552

Bug 1022552 - Pressing home key or opening other apps will close client provision message directly.r=gsvelto
Merge pull request #21288 from justindarc/bug1030007

Bug 1030007 - Huge frame drops observed while zoom in/out during Video r...
Merge pull request #21464 from KevinGrandon/crdlc-bug-1033661

Bug 1033661 - [Collections] Icons overlay "Connect to the Internet" message when browsing offline a Smart Collection
Merge pull request #21466 from khuey/1035432

Bug 1035432 - InitLogoHandler entrains the DOM nodes used to display the logo. r=alive
Bug 1014706 - Hide the accept button when in SI/SL mode r=julienw

(cherry picked from commit 9634534545d4c17f7265029191a32afc662fcca0)
Bug 1035442 - Split up collections tests r=amirn
Merge pull request #21488 from shufang-xu/bug1033889xsf_master

 Bug 1033889 - unable to read cell broadcast message on lock screen. r=ferjmoreno,Michael Henretty
Merge pull request #21491 from gmarty/v2.0

Bug 1027391 - SIM lock shows a transparent status bar
Bug 1033260 - [Messages] Contact suggestion list didn't dismiss when focus on subject and message input field r=julien,azasypkin

(cherry picked from commit 39b45bf77b6ea44f7576a986b4ae1035114cb746)

Conflicts:
	apps/sms/test/unit/thread_ui_test.js
Merge pull request #21494 from guilherme-pg/bug1030448-v2.0

Bug 1030448 - Also make the default lockscreen react to the 'lockscreen....
Merge pull request #21296 from 6a68/bug-1032903-erase-all-storages

Bug 1032903 - Erase internal storage if SDcard is default. r=ggp
Bug 1033531 - [Vertical Homescreen] Apps dont appear in custom smart collections if Smart Collection is entered too quickly
Merge pull request #21444 from alivedise/bugzilla/1027401_v2.1/reset-orientation-on-popupclose

Bug 1027401 - Change child event mechanism, r=etienne
Merge pull request #21294 from dominickuo/bug-1009133

Bug 1009133 - [Music] Add hidden style to the player and done icons, r=jimporter
Conflicts:
	shared/test/integration/travis-manifest.json
Merge pull request #21500 from etiennesegonzac/bug-1027231

Bug 1027231 - Making sure windows' height are integers in device pixels. r=alive