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 1035250 - Add incremental statusbar icons in FTU
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 1042584 - [Contacts][ICE] Select the contact from the list r=sergi
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 1060475 - [email] DEBUG=1 in firefox nightly not working with emailjs changeset
Bug 1033549: Review follow up
Revert "Bug 1041372 - [User Story] Rocketbar behavior for fullscreen apps with navigation chrome r=vingtetun"

This reverts commit 220224e03d5a4c2da1d33a79fafa87de0b8779c3.
Bug 1059332 - Strings for FMD error flows. r=arthurcc
Bug 1047356 -  Modify the call log user interface to link to the call information page

Modify the selector to find the menu item with the new way we construct it.
Bug 1059833 - [gaia-header] Button transition-delays should only impact touch/user interaction
Merge pull request #23502 from jrburke/bug1060475-email-debug-1-setup

Bug 1060475 - [email] DEBUG=1 in firefox nightly not working with emailjs changeset r=asuth
Bug 1035763 -- Support 24 hour time format. r=drs.
Merge pull request #23510 from Rik/integration-test-followup-1047356

Bug 1047356 -  Modify the call log user interface to link to the call in... r=drs