Bug 1038496 - Re-enable radio when rild crashes
Bug 1054140 - Early return when navigating to the same panel
Bug 1053684 - [Clock] The Alarm sound volume is set at maximum after some common operations
Bug 1004329 - [Flatfish][Homescreen] Returning home (landscape) from portrait app causes app icons to misalign/overlap

* Fix ScreenHelper width/height error due to mediaQueryListener being fired twice right after maketplace app closed.
Bug 1053728 - App icon size incorrect from rocket bar search result
Bug 1047276 - [Vertical Home-screen] Change in position of smart collections in default-Homescreen json doesnt reflect on screen
Bug 1045236 - contacts import screen has a strange notion of "TODAY", which includes yesterday
Bug 971520 - [System2] Instantiable NfcManager, r=alive
Bug 1049489 - gaiatest: execute all ContactsAPI calls in chrome context
Bug 1038815 - Contacts can get into a 'frozen' state in some cases
Make gecko recording errors display a generic error message instead of nothing
Fix copy and paste error (and source) for error callback prototype
Bug 1054333 - Create Firefox OS test job for testing phone specific features per checkin
Add brief comment clarifying why we ignore err param
Bug 1042463 - System Update prompt persists in low-battery environment

Fix prompt appearing even when battery is below allowed threshold,
introducing a new update-prompt-result event type.
Merge pull request #22920 from shamenchens/Bug1053728-RocketBarSearch

Bug 1053728 - App icon size incorrect from rocket bar search result, r=kgrandon
Merge pull request #22025 from begeeben/1004329_returning_home

Bug 1004329 - [Flatfish][Homescreen] Returning home (landscape) from portrait app causes app icons to misalign/overlap, r= Cristian Rodriguez (:crdlc)

* Fix ScreenHelper width/height error due to mediaQueryListener being fired twice right after maketplace app closed.
Bug 800402 - [email/backend] UI: Show the number of unread messages in the message-list header after the folder name. r=asuth

Land the back-end parts of bug 800402 and bug 888955 which it depends on.
The UI parts are separable and we're landing the back-end stuff on its own to
avoid back-end bit-rot.

The changes in here exactly correspond to those in:
https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/328
Bug 1040712 - [System] use same silent style icon for status bar and sound manager
Bug 1055908 - Add missing unit-tests for bug 1035117