Bug 1042478: AirplaneModeHelper.ready is invoked several times.
Bug 1033402 - Wait for the available marionette socket. a=test-only

Also part of bug 1027232
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
Merge pull request #22311 from arcturus/bug-1045503

Bug 1045503 - [tarako][contacts] we should reduce the use of storage by contacts app r=jmcf
Merge pull request #22357 from ferjm/bug1046736.mobileidcc

Bug 1046736 - [MobileID] Set default country code in phone number manual...
Merge pull request #22318 from kamituel/Bug_1046289_bt_connect_broken

Bug 1046289: Call _doConnect() instead of doConnect().
Merge pull request #22359 from guilherme-pg/bug1046571-reentrant-registration-wakelock

Bug 1046571 - Release wakelock on reentrant Find My Device registration.
Conflicts:
	apps/findmydevice/test/unit/findmydevice_test.js
Merge pull request #22440 from KevinGrandon/bug_1043689_vertical_homescreen_dragdrop_init

Bug 1043689 - Safeguard against loading multiple dragdrop objects
Merge pull request #22489 from azasypkin/bug-1048204-back-button

Bug 1048204 - The back button seems like pressed even without pressed. r=schung
Merge pull request #22536 from justindarc/bug1043705-v2.0

Bug 1043705 - Selecting same resolution twice will make the preview comp...
Bug 1043856 - Increase connection timeout
Bug 1044033 - Video Encode: Flicker in the preview can be observed when we change the resolution in front camera