Bug 1042478: AirplaneModeHelper.ready is invoked several times.
Bug 1043856 - Increase connection timeout
Merge pull request #22463 from PinZhang/pzhang/bug1042478-2.0

Bug 1042478: AirplaneModeHelper.ready is invoked several times.
Bug 1045701 - Part 1 [Collection App] - Use proper icon regardless of device size r=yurenju
Merge pull request #22529 from justindarc/bug1040952

Bug 1040952 - Camera/Video should use Color layer for background
Merge pull request #22539 from nullaus/bug1047609

bug 1047609 - Land 60x60 version of new System App icon. r=kgrandon
Bug 1027232 - Wait for the homescreen to be ready
Merge pull request #22600 from hfiguiere/v2.0

Bug 1027232 - Wait for the homescreen to be ready a=npotb
Revert "Bug 1042032 - Disable test_gallery_view until dwong fixes the phones"

This reverts commit 24434c2756ed3cb2a3002335451da283c305b0d4.
Bug 1045701 - Part 3 [FTU] - Start the Smart Collection migration process with or without upgrade. r=fcampo
Merge pull request #22272 from eliperelman/bug-1045076-perf-timestamp-failsafe

Bug 1045076 - Add sanity check to timestamp handlers and return values r=hub
Merge pull request #22273 from eliperelman/bug-1045717-close-app-on-memory-test-failure

Bug 1045717 - Close app before asserting values from memory usage r=hub
Bug 1040981 - [B2G][Browser] While in landscape mode the 'Default search engine' drop down is cut off r=kgrandon
Merge pull request #21692 from dominickuo/bug-1032638

Bug 1032638 - [Music] Ignore the MP4 files with not enough metadata, r=jimporter
Merge pull request #22413 from guilherme-pg/bug1037232-unverified

Bug 1037232 - Display an error message for unverified accounts. r=arthur...
Conflicts:
	apps/settings/elements/findmydevice.html
Merge pull request #22598 from KevinGrandon/bug_1049014_search_start_stop_grid

Bug 1049014 - [B2G][E.me][Search Results] Long pressing on a search result launches the app when released
Merge pull request #22585 from julienw/1049741-set-position-at-startup

Bug 1049741 - [Messages] navigation.js sets the data-position after a fi...
Revert "Merge pull request #22598 from KevinGrandon/bug_1049014_search_start_stop_grid" for Gu bustage

This reverts commit 7e207c9aef2b36692b8ae1f7ebdf02e84299aaed.
Bug 1049014 - [B2G][E.me][Search Results] Long pressing on a search result launches the app when released r=julienw
Merge pull request #22616 from dominickuo/bug-1050112

Bug 1050112 - [Music] correct the media-button path, r=jimporter(cherry picked from commit fee004dbe33efc7f7269ed19f951763bb4ea1874)