Bug 1045236 - contacts import screen has a strange notion of "TODAY", which includes yesterday
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 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 1055972 - disable keyboard uninstallation test.
  - apps/keyboard/test/marionette/uninstallation_test.js
Merge pull request #23058 from asutherland/email-unread-msgs-backend

Bug 800402 - [email/backend] UI: Show the number of unread messages in the message-list header after the folder name. r=asuth
Merge pull request #23037 from gregarndt/gaia_sanity_tests

Bug 1054333 - Create Firefox OS test job for testing phone specific feat...
Bug 1044484 - Add an external tag to gaiatest manifests to denote tests use of external internet resources
Merge pull request #22195 from zacc/bug_1044484

Bug 1044484 - Re-jig the gaia-ui-tests manifests to obsolete tbpl-manife...
Merge pull request #23069 from RudyLu/keyboard/Bug1055972-disable_keyboard_uninstallation_test

Bug 1055972 - disable keyboard uninstallation test.
r=test-only
Merge pull request #22923 from zacc/bug_1049489_contacts_api

Bug 1049489 - gaiatest: execute all ContactsAPI calls in chrome context
Revert "Bug 1043892 - [LockScreen] Solve the visual regression caused by Bug 1043821, with panel switching refactoring" for test failures

This reverts commit a47e7934f4793d24723d1d340608bd6e0bc1fc8d.
Bug 1048593 - Changing system confirm dialogs to account for software home button
Merge pull request #23032 from ADLR-es/fix-bug-1045236

Bug 1045236 - contacts import screen has a strange notion of "TODAY", which includes yesterday
Revert "Bug 1052503 - [Rocketbar] Update loading progress bar r=benfrancis" for B2G debug emulator xpcshell timeouts

This reverts commit 3a31d1317cffb14fb0636467ce2dcca15c9b19d3.
Merge pull request #23047 from eliperelman/bug-1048593

Bug 1048593 - Changing system confirm dialogs to account for software home button