Bug 1033549: [CostControl] Add a per-app data usage list. r=salva
Bug 1060208 - [Settings] patch new panels with gaia-headers
Bug 1032008 - Fix jshint error for build/jshint/xfail.js
Bug 1059668 - Move some keyboard removal logics from keyboard_manager.js to input_frame_manager.js
Bug 1060294 - [bluetooth] Update new settings.html with gaia-header
Bug 1032023 - Fix jshint error for build/pre-app.js

Conflicts:
	.jshintignore
Bug 1060385 - [shared/pages/import] Implement gaia-header
Bug 1054716 - Prevent system notification banners from overlaying the software home button
Bug 1060462 - Avert race condition in gaiatest when interacting with language select menu in Settings app r=qdot
Bug 1033549: Review follow up
Bug 1059332 - Strings for FMD error flows. r=arthurcc
Bug 1059833 - [gaia-header] Button transition-delays should only impact touch/user interaction
Revert "Revert "Bug 940647 - Move bookmark creation to operator variant app""

This reverts commit 2893542864856b672c05d0e6ed72b289e06cf306.
Bug 1043516 - [email] Error Domains for sockets.
Bug 940647 - Fix format of data in unit test
Bug 1051795 - [CMAS] Handle the setting that enables/disables CMAS alerts
Bug 1054178 - [Gaia][calendar] support 24 hour time format r=millermedeiros
Merge pull request #23513 from mcav/error-domains

Bug 1043516 - [email] Error Domains for sockets. r=asuth a=mhenretty
Merge pull request #23063 from evanxd/bug-1054178

 Bug 1054178 - [Gaia][calendar] support 24 hour time format r=millermedeiros
Merge pull request #23466 from steveck-chung/network-alerts-api-work

Bug 1051795 - [CMAS] Handle the setting that enables/disables CMAS alerts. r=azasypkin