Bug 1034570 - Notify the user if initial registration fails r=
Bug 1042478: AirplaneModeHelper.ready is invoked several times.
Merge pull request #22382 from crh0716/1046068

Bug 1046068 - Add the default value for mms delivery report
Bug 1048201 - [System] STK Command for choosing an option is not working on v2.0
Merge pull request #22450 from mozmark/bug1034570-v2.0-uplift

Bug 1034570 - Notify the user if initial registration fails r=gerard-majax
Bug 1043293 - [Verticalhome] use "touchend" instead of "click" to launch applications r=kgrandon

* attach the scroll event on the main window
* remove stopImmediatePropagation from some locations so that the contextmenu
  event can be received by the grid
* if the event is defaultPrevented, we don't do the default action, that is
  neither drag&drop (edit mode) or launch an app
Merge pull request #20461 from justindarc/bug1024753

Bug 1024753 - [Camera] Add Camera app to whitelistedUnifiedApps
Conflicts:
	tests/performance/startup_events_test.js
Bug 1034560 - Utility tray is closed when the airplanemode button is

pressed
Merge pull request #22483 from lodr/bug-1048201-fix-typo-preventing-stk-command

Bug 1048201 - [System] STK Command for choosing an option is not working on v2.0
r=frsela
r=alive
Merge pull request #22458 from EragonJ/v2.0-bug-1034560

Bug 1034560 - Utility tray is closed when the airplanemode button is pressed
Bug 1043293 - Follow up with test changes to address non-functional Travis failures
Merge pull request #22438 from fcampo/fte-time-choose-1042388

Bug 1042388 - [FTU] Changes to Region/City selectors are not displayed onscreen (r=francisco)
Conflicts:
	apps/ftu/js/app.js
Bug 1044316 - Dont assume uppercase .nodeName. r=kgrandon
Merge pull request #22313 from KevinGrandon/bug_1046158_homescreen_columns

Bug 1046158 - [Vertical Homescreens] Use three columns by default everywhere
Merge pull request #22314 from KevinGrandon/bug_1046158_homescreen_settings_cleanup

Bug 1046158 - [Settings] Revert logic for column display detection
Conflicts:
	apps/settings/elements/homescreen.html
Bug 1042388 - Add back line that was accidentally removed when rebasing. a=bustage
Bug 1045701 - Part 2 [Homescreen] - Do not migrated un-initialized smart collections r=amirn
Bug 1043705 - Selecting same resolution twice will make the preview completely blank
Merge pull request #22524 from hfiguiere/v2.0

Bug 1033402 - Wait for the available marionette socket. a=test-only r=kgrandon
Merge pull request #22280 from eliperelman/bug-1037500-add-helper-for-clock-tests

Bug 1037500 - Adding perf helper to clock app to fix performance tests. r=mcav