Bug 989418 - Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL"

This reverts commit a9aa1882f4b0e472f3686b157eb119d17ae60a91.
The original revert broke a lot of things and was not done correctly.

Conflicts:
	apps/clock/js/panels/timer/panel.html
	shared/style_unstable/input_areas.css
Bug 989916 - [System] Fix captive_portal_test.js when run in its own sandbox r=me
Bug 989951 - Bump gaiatest version to 0.21.10. r=fstrugariu
Merge pull request #17809 from davehunt/bug989951

Bug 989951 - Bump gaiatest version to 0.21.10
Merge pull request #17766 from julienw/revert-bad-revert

Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" ...
Merge pull request #17800 from KevinGrandon/bug_989916_captive_portal_test_sandboxing

Bug 989916 - [System] Fix captive_portal_test.js when run in its own sandbox
Bug 962918 - Update marionette-client to 1.1.5 r=me