Bug 1027391 - SIM lock shows a transparent status bar
Bug 1030448 - Also make the default lockscreen react to the 'lockscreen.lock-immediately' setting.
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
Revert "Merge pull request #21444 from alivedise/bugzilla/1027401_v2.1/reset-orientation-on-popupclose"

This reverts commit 4e3f949226e82938aa8ce0fa9c7d29f36243afde.
Revert "Bug 1031524 - Search Engine based on MNC/MCC in browser.json is not included in the Settings -> Homescreen -> Search Engine. r=benfrancis"

This reverts commit de7448291f57121314dcfbad0a4fa966b2308bd4.
Merge pull request #21503 from nullaus/bug1035367

bug 1035367 - Update download_ui.js so that it uses data-l10n-id and dat...
(cherry picked from commit 6da21120e77b6a4ad878dd4531305cd393f6734c)
Merge pull request #21553 from nullaus/v2.0

Merge pull request #21503 from nullaus/bug1035367
Bug 1032288 - Intermittent failing test, follow-up Vertical Home  - Packaged App Update resume update r=me
Merge pull request #21135 from millermedeiros/1031136-all-day-overlap

Bug 1031136 - [Calendar] "All day" overlaps in month view for long localizations r=gaye
Merge pull request #21438 from ian-liu/settings/wifi/bug1033183_server_certificate_items_are_duplicated_when_disabling_and_reenabling_wifi

Bug 1033183 - [Wifi] Server certificate items are duplicated when disabling and re-enabling wifi, r=arthur
(cherry picked from commit e970c7e69c213fd896383b0dc7b85a1b7b1d7dc8)
Merge pull request #21501 from 6a68/bug-1032938-use-fmd-prod-servers

Bug 1032938 - Point find my device at production servers (resubmitted). ...