Merge pull request #13798 from bebef1987/xfail_email

Bug 939771 - xfail test_setup_basic_gmail.py
Merge pull request #13793 from julienw/add-expiration-and-conditional-content-logic-in-httpd-js

Bug 939729 - With httpd.js we sometimes don't get the most recent versio...
Bug 939722 - Xfail test_cost_control_data_alert_mobile
Merge pull request #13800 from bebef1987/xfail_cost

Bug 939722 - Xfail test_cost_control_data_alert_mobile
Bug 938051 - Intermittent failure in test_delete_contact
Revert "Bug 937630 - All you need is ... smooth unlock transition" for bustage in Gaia Unit Tests

This reverts commit 68fc2b25ce4648ca70be8efc589b81cb0bab4465.
Merge pull request #13789 from crdlc/bug-933561

Bug 933561 - App does not come to foreground if user quickly toggles bet...
Bug 924454 - Make the busy tone longer and clearer r=etienne
Merge pull request #13782 from pivanov/bug-939148

Bug 939148 - [Action Icons - Calendar] Remove shadows from action icons r=kgrandon
Merge pull request #13762 from eeejay/bug-938931

Bug 938931 - [FTU] Fix checkbox regressions from bug #914892. r=fcampo
Bug 933279 - Updating the telephony part of the ScreenManager to work
with conference calls. r=alive
Bug 939773 - Fixing a ReferenceError: asyncStorage the first time the
keypad suggestion is used after a cold launch.
bug 939105 - Python test_sms_contact_match - wait for keyboard to be fully opened before tapping on the keyboard
Bug 939849 - [Calendar] Fix checkboxes in calendars list. Regression from bug #914892.
Bug 939232 - [Action Icons - Lockscreen] Remove shadows from action icons
Merge pull request #13429 from ochameau/perms

Bug 930104 - Remove localId=0 hack for the system app on firefox and correctly set permission for any app loaded in Firefox r=vingtetun
Bug 933206 - [Status Bar] Update Battery Icons
Bug 939224 - [Action Icons - Notification Tray] Remove shadows from action icons
Adding url keyboard test
Bug 933079 - [e-mail] gmail connections not noticing new messages properly