Bug 1061532 - Only set the category of a newly apn item to custom when restoring from a custom apn setting
Bug 1064630 - [Lockscreen] Locking device after entering a passcode leaves the user in an unrecoverable state
Bug 1061858 - [Cost Control][Usage app] Usage app disables Wifi tracking after exiting/launching Usage app
Bug 1065286 - [NFC] TNF_RESERVED usage removal, r=gweng
Bug 1059106 - [settings] move root panel airplane mode item into panels/root
Bug 1051219 - Part I, Centralize the IMERender.setUpperCaseLock() call and skip if not rendered
Bug 1051219 - Part II, Centralize candidate rendering
Bug 1051219 - Part III, Move handleUpperCaseStateChange to renderingManager
Bug 1051219 - Part IV, Block IMERender calls if rendering is not updated yet
Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan

Conflicts:
	Makefile
Bug 1052256 - Block the click events before the first panel gets ready
Bug 1067251 - [Contacts] [Regression] Cannot reset phone field when editing a contact
Bug 1066847 -  Statusbar icons disappear in utility tray r=mhenretty
Bug 1067266 - Removed BLUE_CHANGE_DELAY from input management script as a follow-up of bug 1057898.

Additionally, one test case was removed as the specific scenario should now be handled/guarded by Gecko (i.e. bug 1057898).
Bug 1061636 - Remove icons from the Cost Control widget FTU section
Bug 1062720 - [STK] Should carry the response in |isYesNo| for "Yes"/"No" request. r=frsela
Bug 1058449 - Tapping on the settings button in contacts doesn't have any effect
Bug 1067431 - Add final search icon assets for expanded Rocketbar
Merge pull request #24031 from EragonJ/bug-1059106-another-try-2

Bug 1059106 - [settings] move root panel airplane mode item into panels/...
Merge pull request #24040 from yurenju/merge-build-apps-2

Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript...