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 1062730 - [NFC] Home button could not work well after receiving multiple websites which are shared via NFC
1. publish activeappchanged when app is changed in app_window_manager.js
2. stop tiltiing effect if receiving activeappchanged event
Bug 1065943 - [Text Selection] Hide utility bubble when scrolling and show bubble when scroll end - gaia part
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 1071064 - [Contacts] [ICE Settings] Even if Select ICE Contact button is disabled it can be clicked
Merge pull request #24329 from crdlc/bug-1071064

Bug 1071064 - [Contacts] [ICE Settings] Even if Select ICE Contact butto...
Bug 1045934 - Emit deprecation warning when using apple-touch icons. r=kgrandon
Merge pull request #24198 from cctuan/1065943

Bug 1065943 - [Text Selection] Hide utility bubble when scrolling and show bubble when scroll end
Merge pull request #23943 from cctuan/1062730

Bug 1062730 - [NFC] Home button could not work well after receiving multiple websites which are shared via NFC
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
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