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 1061401 - Fix multiple activity window orientation issue
Bug 1055299: Ignore continuous app launch request in homescreen side and send homescreen to background while rocketbar is open in system side
Merge pull request #24035 from shamenchens/Bug1061401-MultipleActivityWindow-2

Bug 1061401 - Fix multiple activity window orientation issue, r=alive
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 1067307 - Disable test_eme_add_collection: crash when tapping on a collection a=test-only
Merge pull request #23982 from albertopq/1065519-indicator-count

Bug 1065519 - Ambient indicator based on list of notifications r=mhenretty
Bug 1066611 - [v2.2] Fix test_geolocation_prompt
Merge pull request #23867 from wilsonpage/1065018

Bug 1065018 - [camera] Focus ring is not always aligned
Bug 1066793 - improved ambient notification indicator accessibility. r=alive
Merge pull request #24049 from chirarobert/fix_geolocation_test

Bug 1066611 - [v2.2] Fix test_geolocation_prompt
Merge pull request #23670 from jpruden92/bug1030564-contacts-v2

Bug 1030564 - [Contacts][DSDS] SIM label flashing once when tapping on 'Add as favorite' and 'Remove as favorite'