Bug 889830 - JavascriptException: TypeError: result[i].type r=etienne
Bug 978696 - [Sora][Contacts] The vCard exported from Soul 3.5 FF can not be imported into Android devices.
Bug 989722 - Draggable element in Collection is not cleared after dragend [r=ranbena]
Bug 989898 - Fix email manual setup steps of gaiatest
Revert "Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen"

This reverts commit 2b0301ae10f7ff15dda86625191a8690725c6daf.
Merge pull request #17498 from KDDI-tech/Bug889830

Bug 889830 - JavascriptException: TypeError: result[i].type r=etienne
Merge pull request #17781 from EverythingMe/989722-dnd-cleanup

Bug 989722 - Draggable element in Collection is not cleared after dragen...
Merge pull request #17707 from sergi/978696

Bug 978696 - [Sora][Contacts] The vCard exported from Soul 3.5 FF can not be imported into Android devices.
Merge pull request #17796 from askeing/989898

Bug 989898 - Fix email manual setup steps of gaiatest
Bug 986882 - [Camera][Madai] Color inconsistency in buttons on active state
Merge pull request #17814 from dmarcos/bug986882

Bug 986882 - [Camera][Madai] Color inconsistency in buttons on active st...