Bug 1065018 - [camera] Focus ring is not always aligned
Bug 1065421 - Add theme color to clock
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 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
Bug 1052256 - Block the click events before the first panel gets ready
Bug 1065519 - Ambient indicator based on list of notifications
Bug 1030564 - [Contacts][DSDS] SIM label flashing once when tapping on 'Add as favorite' and 'Remove as favorite'
Merge pull request #23964 from albertopq/1063305-nfc-statusbar

Bug 1063305 - NFC icon disappear after reboot r=alive
Merge pull request #23937 from alivedise/bugzilla/1055299_master/v4

Bug 1055299: Ignore continuous app launch request in homescreen side and...r=kgrandon
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 1067307 - Disable test_eme_add_collection: crash when tapping on a collection a=test-only