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 1032023 - Fix jshint error for build/pre-app.js

Conflicts:
	.jshintignore
Bug 1033549: Review follow up
Bug 1059332 - Strings for FMD error flows. r=arthurcc
Bug 1060801 - Rename "Cancelled" to "Canceled" in call info view. r=Rik
Bug 1054466 - Restore overflow menu via contextmenu. r=kgrandon
Bug 1032001 - Fix jshint error for build/copy-build-stage-data.js
Merge pull request #23503 from daleharvey/1054466

Bug 1054466 - Restore overflow menu via contextmenu. r=kgrandon
Bug 1043496 - Default Image for Contacts When Image is Missing | followup r=arcturus
Bug 1059157 - Reduce the overpaint of the camera app. r=jdarcangelo
Merge pull request #23537 from vingtetun/camera.less.overpaint

Bug 1059157 - Reduce the overpaint of the camera app. r=jdarcangelo
Bug 1058707 - Add launch task manager button to Browser overflow menu
Bug 1059159 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/calendar/test/marionette/create_event_test.js r=kgrandon
Bug 1060935 - [System] Fix statusbar notification after update check r=apastor
Merge pull request #23539 from KevinGrandon/bug_1060935_statusbar_error

Bug 1060935 - [System] Fix statusbar notification after update check
Bug 1043177 - Redesign Contact edit page
Merge pull request #23530 from arcturus/bug-1043496

Bug 1043496 - Default Image for Contacts When Image is Missing | followup r=arcturus