Bug 1022633 - Fix branding path in DEBUG=1 mode. r=yurenju
Bug 1021578 - use "$(SEP)" instead of "/" for app-makefile-template
Bug 1015479 - Make header markup follow visual order.
Bug 973443 - [settings] refactor Display panel with AMD pattern
Bug 1023312 - [Vertical homescreen] Smart collection viewing fails on the flame because e.me server fails to return background. [r=amirn]
Bug 1021327 Flatfish verticalhome not default
Bug 1023011 - (vertical-homescreen) Implement pressed state visual for App Icons
Bug 1023878 - make sure we stop if the make targets fail.
Bug 1020605 - (gaia-grid) Append all children to shadow root by removing <content> selector tag.
Revert "Bug 1004251 - Add resend verification email to firefox accounts. r=ferjm,arthurcc"

This reverts commit f8f70f699d50d3669b507c1bad245b1709c95a50.

Conflicts:
	apps/settings/js/firefox_accounts/panel.js
Merge pull request #20372 from 6a68/revert-bug-1004251

Revert "Bug 1004251 - Add resend verification email to firefox accounts....
Merge pull request #20359 from EverythingMe/1023312-floor-dimension

Bug 1023312 - [Vertical homescreen] Smart collection viewing fails on the flame because e.me server fails to return background. [r=amirn]
Merge pull request #20364 from crdlc/bug-1023011

Bug 1023011 - (vertical-homescreen) Implement pressed state visual for App Icons
Merge pull request #19613 from eeejay/bug-1015479

Bug 1015479 - Make header markup follow visual order. r=arnau
Bug 1022052 - Add setting to disable searching remote provider. r=kgrandon, r=evelyn
Revert "Bug 1023011 - (vertical-homescreen) Implement pressed state visual for App Icons"

This reverts commit 2728b437562eb0285b3f3279623d978537638bf6.
Merge pull request #20366 from hfiguiere/Bug1023878

Bug 1023878 - make sure we stop if the make targets fail. r=julienw
Bug 1022094 - Add test to cover appcache installed download case a=test-only
Merge pull request #20380 from lightsofapollo/hosted-app-icon-test

Bug 1022094 - Add test to cover appcache installed download case a=test-...
Merge pull request #20227 from ochameau/branding

Bug 1022633 - Fix branding path in DEBUG=1 mode. r=yurenju