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 973598 - Fix test_sms_notification intermittent failure
Added a wait for the homescreen to fully load  before sending the sms.
Bug 973828 - Resume the app when a system message access a suspending app
Bug 965853 - Display SIM indication in missed call notification

Refactored mock_call to handle several handlers for one event type
Moved a few files to jshint linting
Bug 972804 - [Camera] Separate settings for camera and video flash
Bug 973941 - Background image request follow-up r=amirn
Fix for bug 969996

Delay chunk rendering by grouping chunks into larger
sets before calling renderChunk.  First set size will
be the same as the current FIRST_CHUNK_SIZE (6).  Subsequent
sets will cap at INCREMENTAL_RENDER_SIZE (60).

The goal is to reduce reflows on rendering the call log.

Also fixed the following bugs:
  _groupCounter never gets incremented if there's only one log entry per day
  Change currDate and prevDate comparison to more readable form

Added unit tests for call log rendering of various sizes.
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 901216 - [l10n.js] make consoleWarn string concatenation-free
Also updated consoleLog string concatenation-free
Bug 975386 - Fix intermitten failure for test_settings_change_keyboard_language.pyFix for test_settings_change_keyboard_language.py.
Added a wait for the newly added keyboard to appear in the list.

Ran an adhoc with this test and it passed http://qa-selenium.mv.mozilla.com:8080/job/b2g.hamachi.mozilla-central.ui.adhoc/225/
Bug 965389 - Ensure that the thumbnails view doesn't grow in size when switching to fullscreen view. r=djf
Bug 974966 - Update keyboard dismiss() method to be less sensitive, use marionette atom
Bug 968346 - Re-enable test_persona_cookie.py with larger page load timeout
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 903134 - Clean up Trusted UI on mozbrowsererror, mozbrowserclose