Bug 972210 - (Part I) Stop exposing inputContext to IMEs
Bug 1033549: [CostControl] Add a per-app data usage list. r=salva
Bug 1048792 - Don't autocorrect if first suggestion has different length (counting alpha chars) than input
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 1059234 - Import sim contacts message not displayed on FTU after importing contacts
Bug 1058545 - Incorrect visual screen in "Enter the top-up code"
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 1038698 - only start running system a11y visibility tests when the logo is completely hidden.
Bug 1059332 - Strings for FMD error flows. r=arthurcc
Bug 1059833 - [gaia-header] Button transition-delays should only impact touch/user interaction
Bug 1047353 - Create a call information page for call log. r=drs
Revert "Bug 940647 - Move bookmark creation to operator variant app"

This reverts commit f6f5eededb5c0646f7791d8d4b9d646203d8c89c.