Bug 972701 - [Camera] Stop Icon overlaps with Camera Shutter icon while recording video

Conflicts:
	apps/camera/style/controls.css
Bug 972804 - [Camera] Separate settings for camera and video flash
Bug 901216 - [l10n.js] make consoleWarn string concatenation-free
Also updated consoleLog string concatenation-free
Bug 973407 - [Messages] Reduce reflows when element heights are updated

1. remove updateElementsHeight() call in messageComposerInputHandler(),
since updateSubjectHeight() already calls it

2. in cancelEdit(), only call updateElementsHeight() if in edit mode

3. in updateElementsHeight(), move code to set input width to 'auto' up
to avoid extra reflow if layout has changed prior to call

Added unit tests for cancelEdit().
Merge pull request #16511 from vijayanandh/warnbugconsole

Bug 901216 - [l10n.js] make consoleWarn string concatenation-free
Bug 947617 - Clock app consuming too much power. r=mcav
Bug 970377 - [Messages][Drafts] Drafts are kept forever r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=970377

- Call Drafts.store() when deleting a just sent draft message
- Fix leaky sinon spy

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 974163 - Turn off rocketbar by default in 1.4 build time
Merge pull request #16530 from mcav/clock-rot

Bug 947617 - Clock app consuming too much power. r=mcav
Merge pull request #16301 from wilsonpage/bug/972701

[Camera] Stop Icon overlaps with Camera Shutter icon while recording video r=dmarcos a=stability
Bug 968454 - [Settings] New icon for Developer menu. r=arthurcc
Merge pull request #16472 from jankeromnes/devmenu

Bug 968454 - [Settings] New icon for Developer menu. r=arthurcc
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