Bug 1060208 - [Settings] patch new panels with gaia-headers
Bug 1032008 - Fix jshint error for build/jshint/xfail.js
Bug 1032023 - Fix jshint error for build/pre-app.js

Conflicts:
	.jshintignore
Bug 1060801 - Rename "Cancelled" to "Canceled" in call info view. r=Rik
Bug 1032001 - Fix jshint error for build/copy-build-stage-data.js
Bug 1058707 - Add launch task manager button to Browser overflow menu
Bug 1043177 - Redesign Contact edit page
Bug 1058387 - [NFC] System browser could not share via NFC anymore once app browser has ever been launched
Bug 1033513 - Edit-mode auto-scroll goes way too fast
Bug 1005752 - [Keyboard] Should not setLayoutFrameActive(false) if we don't need to
Merge pull request #23412 from crdlc/bug-1033513

Bug 1033513 - Edit-mode auto-scroll goes way too fast
Merge pull request #23449 from cctuan/1058387

Bug 1058387 - [NFC] System browser could not share via NFC anymore once app browser has ever been launched
Merge pull request #23451 from gasolin/issue-1060208

Bug 1060208 - [Settings] patch new panels with gaia-headers, r=eragon
Merge pull request #23457 from xfq/Bug1032008r2

Bug 1032008 - Fix jshint error for build/jshint/xfail.js r=yurenju
Bug 1061115 - Xfail test_toggle_bluetooth_settings
Merge pull request #23556 from bebef1987/x

Bug 1061115 - Xfail test_toggle_bluetooth_settings
Bug 1032005 - Fix jshint error for build/download-manager.js
Bug 1022192 - Add more log for utils-xpc:removeFiles() r=me
Merge pull request #23559 from xfq/Bug1032005r2

Bug 1032005 - Fix jshint error for build/download-manager.js r=yurenju
Merge pull request #23533 from xfq/Bug1032001r2

Bug 1032001 - Fix jshint error for build/copy-build-stage-data.js r=yurenju