Bug 1031430 - (2.0-visual-refresh)[Notifications and Alarms] - Add New Signature Firefox OS tone
Merge pull request #21546 from julienw/1033472-improve-node-modules-dependencies

Bug 1033472 - Gaia linter, gaia-build tests aren't using NODE_MODULES_GI...
(cherry picked from commit 10f141af83815940d1bd2b00a05c4f2e0965a0e3)
Merge pull request #21605 from julienw/1033472-v2.0-improve-node-modules-dependencies

a=tests
Merge pull request #21546 from julienw/1033472-improve-node-modules-depe...
Bug 1028789 - [Sora]There is no character counter inside STK submenus
Merge pull request #21616 from mcjimenez/bug1028789_v2.0

Bug 1028789 - [Sora]There is no character counter inside STK submenus (r = vingtetun)
Merge pull request #21391 from etiennesegonzac/bug-1034347

Bug 1034347 - Bringing back the edge-candidate logic to prevent crazy overfill rate r=21
Bug 1033049 - Ensure notice isnt shown when < 3 chars typed. r=kgrandon
Bug 1033041 - Only show search notice alongside results. r=kgrandon
Merge pull request #21496 from azasypkin/bug-1034633-subject-padding

Bug 1034633 - [Messages] subtle padding issues while manipulating the subject. r=julien
Merge pull request #20477 from gasolin/issue-1009271-3

Bug 1009271 - opened window.open dialog link as view activity, r=alive
Merge pull request #21506 from 6a68/bug-1034331-fxa-coppa-progress-bar

Bug 1034331 - Decrement fxa step count when going back from COPPA screen...
Merge pull request #21456 from cctuan/1035010

Bug 1035010 - [edge gestures] Unlocalized App name appear while switching App (without changing locale after reboot)
Merge pull request #21601 from dominickuo/bug-1036402

Bug 1036402 - [System] Only change the SCO volume when SCO is connected, r=alivedise
Merge pull request #21591 from etiennesegonzac/bug-1034347-bis

Bug 1034347 follow up - Fixing over paint issues r=21
Merge pull request #21461 from guilherme-pg/bug1035321-handle-accuracy

Bug 1035321 - Send the accuracy of locations to Find My Device's server.
Bug 1029766 - Intermittent TEST-UNEXPECTED-FAIL | collection_test.js | Vertical - Collection drag icon (/w entry point) into collection r=crdlc

Conflicts:
	shared/test/integration/tbpl-manifest.json
	shared/test/integration/travis-manifest.json
Merge pull request #21082 from gaye/bug-1030908-ical.js-build-broken

Bug 1030908 - Upgrade ical.js to v0.0.2 to pick up build fix
Conflicts:
	apps/calendar/package.json
Merge pull request #21619 from willyaranda/bug1033318

Bug 1033318. Show a country list, with a prefix hint. r=ferjm
Bug 1029766 - Follow-up, fix manifest JSON r=me
Revert "Merge pull request #21461 from guilherme-pg/bug1035321-handle-accuracy"

This reverts commit d46332fbf16a683a7a29ad3c78d865ca1767d354.