Bug 958003 - [Keyboard][V1.4] FxOS cannot pops up third party keyboard after process manager kills it
    -- after OOM keyboard will not get 'oninputcontextchange' at first time while keyboard app is using
    -- so can not only depens on 'oninputcontextchange' to show keyboard layouts.
Bug 972701 - [Camera] Stop Icon overlaps with Camera Shutter icon while recording video

Conflicts:
	apps/camera/style/controls.css
Bug 973828 - Resume the app when a system message access a suspending app
Bug 972804 - [Camera] Separate settings for camera and video flash
Bug 973941 - Background image request follow-up r=amirn
Bug 962177 - Ignore .git/ when packaging webapps
Bug 963010 - [NFC] When shrinking UI showed up, it will be strange when clicked on home button
Bug 972729 - [NFC] landscape NFC shrinking UI has some issue
Bug 971648 - Add warning message if there is no
 manifest.webapp or update.webapp in an app directory
Bug 975350 - [System] compress gUM image
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().
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.