Bug 1061532 - Only set the category of a newly apn item to custom when restoring from a custom apn setting
Bug 1065018 - [camera] Focus ring is not always aligned
Bug 1065421 - Add theme color to clock
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
Revert "Bug 1052241 - Disable network activity icon in DEBUG mode"

This reverts commit bcc84b7dcb3be974ca7a329f1aa63c9cfb1c4f91.

Conflicts:
	apps/system/js/statusbar.js
Bug 1063310 - [email] When sending multiple attachments, all but the first are sent as zero-byte attachments. r=asuth
Bug 1066045 - [v2.2][v2.1] Rapidly tapping record after switching from picture to camera mode will take photo instead of video
Bug 1063305 - NFC icon disappear after reboot
Bug 1059106 - [settings] move root panel airplane mode item into panels/root
Bug 1061401 - Fix multiple activity window orientation issue
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 1055299: Ignore continuous app launch request in homescreen side and send homescreen to background while rocketbar is open in system side
Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan

Conflicts:
	Makefile
Merge pull request #24035 from shamenchens/Bug1061401-MultipleActivityWindow-2

Bug 1061401 - Fix multiple activity window orientation issue, r=alive
Bug 1052256 - Block the click events before the first panel gets ready