Bug 1073745 - [Lockscreen] Unlock to camera twice brings a blank screen.
Merge pull request #24524 from nullaus/bug1074043

bug 1074043 - Listen for new activities and adjust titlebar styling as e...
(cherry picked from commit 22b1698a71db620b1dd04867aba55efbfd9f23d7)
Merge pull request #24719 from nullaus/v2.1

Merge pull request #24524 from nullaus/bug1074043
Bug 1007948 - SIM Error message disappears on iccinfochange
Bug1072013-[Video]-Opening the video app or tapping the camera icon will cause a white screen transition r=hub
Bug 1074790 - [Messages] We should revoke contact image blob URL when contact or its image is removed. r=julien
Bug 1074580 - Do not display fullscreen home button when in fullscreen layout
Bug 1074569 - Always use black background for fullscreen layout software home button
Bug 1074352 - Listen to titlestatechanged on ftu
Bug 1068116 - [email/POP3] email.js POP3 attachment regressions: binary attachments are corrupted on download and partially downloaded attachments are saved to disk. r=mcav

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/342 in gaia
Bug 1074152: Handle discoverystatechanged event in bluetooth app.
Bug 1074417 - [Search] Search translanted app names for query r=daleharvey
Bug 1054570 - Cursor is set to the beginning of the password field after it has been shown as plain text
Bug 1074512 - [TaskManager] Allow search app role in filter
Bug 1071943 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/communications/contacts/test/mar
ionette/ice_test.js | Contacts > ICE contacts ICE contacts Select ICE contact from search, go back to ICE settings a=nbotb
Bug 1061422 - [Contacts] ICE can be set to a contact without number
Bug 1073566 - [Utility Tray] Alignment of header text
Follow up on Bug 1057977 - [Status Bar] Remove AM/PM indicator

Conflicts:
	build/config/common-settings.json
Merge pull request #24747 from gmarty/Bug-1073566-Utility-Tray-Alignment-header-text-v2.1

Bug 1073566 - [Utility Tray] Alignment of header text
Merge pull request #24533 from KevinGrandon/bug_1074512_to_two_dot_one

Bug 1074512 - [TaskManager] Allow search app role in filter