Bug 987915 - [settings] 'Dump layers tree' always in English/not localized, wrong data-l10n-id used (dump-layers vs. dumps-layers)
Bug 988117 - GAIA UI Test will fail if convert WifiManager to WebIDL
Bug 974731 - Disable intermittent failing test, creating an event opening event in read view should display the created event in read view
Merge pull request #17617 from DimiL/master

Bug 988117 - GAIA UI Test will fail if convert WifiManager to WebIDL
Merge pull request #17598 from Archaeopteryx/settings-bug987915-dumpLayersTree

Bug 987915 - [settings] 'Dump layers tree' always in English/not localized, wrong data-l10n-id used (dump-layers vs. dumps-layers). r=fabrice
Revert "Revert "Merge pull request #17599 from dmarcos/camera-new-features-master""

This reverts commit d9c16d43ea220639982d7aadd2b8e764e9beebe8.

Conflicts:
	build/test/integration/build.test.js
Bug 988118 - Gaia unit test failures on TBPL due to the camera merge