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 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 1060264 - Lockscreen PIN keypad: "Emergency Call" text overflow in some languages
Bug 1033513 - Edit-mode auto-scroll goes way too fast
Merge pull request #23465 from mnjul/bug_1060264_lockscreen_emergencycall_textstyle

Bug 1060264 - Lockscreen PIN keypad: "Emergency Call" text overflow in some languages. r=gweng. ui-r=Carol
Merge pull request #23410 from mnjul/bug_1059668_move_kb_rm_to_input_frame_manager

Bug 1059668 - Move some keyboard removal logics from keyboard_manager.js to input_frame_manager.js. r=timdream
Revert "Merge pull request #23504 from gmarty/Visual-Refresh-hotfix"

This reverts commit 40be751fb4e79d49cb4470d104b34a06c4359afa, reversing
changes made to c1a089f2a059004c218b6783b166bddd8554ab1c.
Revert "Merge pull request #23506 from jrburke/system-lint-error"

This reverts commit c1625ae6a088ee362b88a2e857147f956f3baea8, reversing
changes made to db6ed35ac354a3eeb5a4bd3c8339bca28f8eb7e6.
Revert "Merge pull request #23153 from gmarty/Bug-1038723-Utility-Tray-Visual-Refresh"

This reverts commit be46e59bc351842fcda012f5b8f24b99cd70cc88, reversing
changes made to c05ee27dd1f39e0f1cceb8bc7706e20f297cd9df.
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