Bug 1066015 - [Camera] black screen when press power key as soon as you open a camera app
Bug 1070918 - [Dialer] Intermittent failure with newer mocha r=rik
Bug 971486 - [System2] Instantiable EdgeSwipeDetector r=alive
Bug 1061440 - Provide an option for restoring only apn items instead of the entire apn settings

Conflicts:
	apps/settings/js/modules/apn/apn_settings_manager.js
Bug 1065302 - Contact phone numbers and phone type should always be separated with a comma
Bug 836690 - Follow up: Add localization comment for sms segments information string. r=flodolo
Bug 1052447 - [Messages] when we're in an activity and we delete all messages in the thread, we should close the activity r=azasypkin
Bug 1071349 - Guard everything.me async settings locks for mock server r=daleharvey
Merge pull request #24309 from KevinGrandon/bug_1071349_async_guard

Bug 1071349 - Guard everything.me async settings locks for mock server
Merge pull request #24256 from KevinGrandon/bug_971486_system2_edge_swipe_detector

Bug 971486 - [System2] Instantiable EdgeSwipeDetector
Bug 1070895 - Pressing ENTER in search box clears search and returns back to inbox
Bug 1057977 - [Status Bar] Remove AM/PM indicator
Merge pull request #24269 from hyunacho/bug1066015

Bug 1066015 - [Camera] black screen when press power key as soon as you ...
Merge pull request #24331 from jpruden92/bug1065302-callscreen

Bug 1065302 - Contact phone numbers and phone type should always be separated with a comma r=drs
Bug 1061215 - [Messages][Refactoring] Improve handling of remaining chars counter. r=julien
Merge pull request #24282 from julienw/1070918-dialer-test

Bug 1070918 - [Dialer] Intermittent failure with newer mocha r=rik
Merge pull request #24321 from jrburke/bug1070895-email-search-enter

Bug 1070895 - Pressing ENTER in search box clears search and returns back to inbox r=asuth
Merge pull request #23726 from azasypkin/bug-1061215-remaining-chars-counter

Bug 1061215 - [Messages][Refactoring] Improve handling of remaining chars counter. r=julien
#1065753 Remove sb-icon-notification from statusbar stylesheet R=gauravmittal1995
Bug 1071884 - Prevent doRenderIcon from logging errors r=kgrandon