Bug 1073745 - [Lockscreen] Unlock to camera twice brings a blank screen.
Bug 1069974 - [Contacts] [ICE] Deleting ICE Contact 1 makes ICE Contact 2 to promote to position 1(cherry picked from commit 84c9fcb8c846203ede478c05886ef9fff9384f79)
Merge pull request #24605 from jmcanterafonseca/position_ice_contacts_21

Bug 1069974 - [Contacts] [ICE] Deleting ICE Contact 1 makes ICE Contact ...
Bug 1071632 - [Contacts] [ICE] ICE Group is not properly refreshed after removing all phone numbers of an ICE Contact

Conflicts:
	apps/communications/contacts/test/marionette/ice_test.js
Bug 1061420 - [Contacts] Delete all numbers which belong to an ICE contact, that ICE should be removed from ICE list
Merge pull request #24611 from jmcanterafonseca/delete_phones_ice_v21

Bug 1061420 - [Contacts] Delete all numbers which belong to an ICE conta...
Bug 1073400 - [Contacts] [ICE] When all ICE Contacts are unset the ICE Contact group list is displayed as empty

Conflicts:
	apps/communications/contacts/js/views/details.js
	apps/communications/contacts/test/marionette/ice_test.js
Bug 1069412 - Email constantly asks me to reauthenticate
Bug 1073032 - Clear ambient indicator when removing notification
Bug 1071382 - [Settings] 2 Icons of brightness level out of place.r=arthurcc
Bug 1071983 - fixing regression with hidden status bar icons when switching to previous app. r=etienne
Bug 1073728 - Reset favicons object after location change r=alive r=daleharvey
Bug 1069992 - [E-Mail] Wobbly Refresh Icon Animation
Bug 1064463 - Do not set caller id explicitly when users preference is not available
Bug 1074432 - [email] display of unsynced folder has overlapping messages
Bug 1074144 - Fix Email app oauth2 authentication failure
Merge pull request #24699 from chirarobert/uplift_email_fix

Bug 1074144 - Fix Email app oauth2 authentication failure
Bug 1067684 - The FTU flow should be aware of network connectivity
fix unit test after converting MozId to webidl
Fix unit test after converting MozId to webidl r=6a68
Bug 1074703 - [ValueSelector] Ensure window listener is removed on destroy r=alive r=gasolin