Bug 972210 - (Part I) Stop exposing inputContext to IMEs
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 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 1032023 - Fix jshint error for build/pre-app.js

Conflicts:
	.jshintignore
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 1060801 - Rename "Cancelled" to "Canceled" in call info view. r=Rik
Bug 1032001 - Fix jshint error for build/copy-build-stage-data.js
Bug 1060879 - Make the first keyboard key audiable
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 1048804 - Fix Firefox account dialog position
Bug 1060264 - Lockscreen PIN keypad: "Emergency Call" text overflow in some languages
Merge pull request #23508 from 6a68/bug-1059332-fmd-error-strings

Bug 1059332 - Strings for FMD error flows r=arthurcc
Bug 1033513 - Edit-mode auto-scroll goes way too fast