Bug 972804 - [Camera] Separate settings for camera and video flash
Bug 974163 - Turn off rocketbar by default in 1.4 build time
Merge pull request #16307 from wilsonpage/bug/972804

Bug 972804 - [Camera] Separate settings for camera and video flash r=dmarcos a=stability
Revert "Merge pull request #16301 from wilsonpage/bug/972701"

This reverts commit d76e2742d251709c76cc297e25e79dd2170c8bb4, reversing
changes made to bad5658f1c678191e21984d3217a4ad2bfad3c94.
Merge pull request #16538 from davidflanagan/revert972701

Revert "Merge pull request #16301 from wilsonpage/bug/972701"
Revert "Merge pull request #16321 from vingtetun/bug971006-final"

This reverts commit 19304fe63b26630f95c6f3a7da49349b433d476e, reversing
changes made to b9859b9c2199e1c5b7e4eda220e556a7ff43cd21.

Conflicts:
	apps/system/js/utility_tray.js
	apps/system/test/unit/utility_tray_test.js
Merge pull request #16539 from qdot/revert-971006

Revert "Merge pull request #16321 from vingtetun/bug971006-final"
Bug 962040 - Catch errors to not break the JSON output. r=julienw

Also make sure VERBOSE is sent to stderr.

Add more verbosity to track where it might hang.
Merge pull request #16535 from KevinGrandon/bug_974163_disable_rocketbar

Bug 974163 - Turn off rocketbar by default in 1.4 build time r=me
Merge pull request #16527 from hfiguiere/bug962040

Bug 962040 - Catch errors to not break the JSON output r=julienw