Bug 1043856 - Increase connection timeout
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)
Merge pull request #22650 from KevinGrandon/bug_1049014_to_2_dot_0

Bug 1049014 - [B2G][E.me][Search Results] Long pressing on a search result launches the app when released
Merge pull request #22599 from svic/Bug_1043856

Bug 1043856 - Increase connection timeout
Bug 1029934 - User cannot input Rupee symbol
Merge pull request #22682 from aniruddha-adhikary/v2.0

Bug 1029934 - User cannot input Rupee symbol (v2.0)
Bug 1050423 - Killing an app that has an open permissions dialog leaks the ContentParent r=alive
Bug 1037284 - [NFC] Screen shows wired and NFC function broken when click home button while initial shrinking UI
Merge pull request #22711 from snowmantw/issue1037284-v2.0

Bug 1037284 - [NFC] Screen shows wired and NFC function broken when clic...
Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py failure
Merge pull request #22717 from viorelaioia/bug_1040063_v2.0

Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py fa...
Bug 1021732 - [Flame] Re-enable test_privileged_app_contacts_prompt
Merge pull request #22733 from chirarobert/unxfail_contacts_prompt

Bug 1021732 - [Flame] Re-enable test_privileged_app_contacts_prompt
Bug 1050339 - [B2G][Smart Collections] Default Smart Collections are missing their icons r=yurenju