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
Bug 974361 - Memory average assumes the array of measurements always exists
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 947617 - fixed clock hand transform to invoke the GPU
Bug 962177 - Ignore .git/ when packaging webapps
bug 939809

* added StackManager.snapshot which gets a copy of the array of applications in the stack
* updated CardsView to get the list of and current app from StackManager
* made StackManager ignore the System application explicitly
* minor changes to help with jshint later
* added 'position' getter on stack manager
* added several tests to ensure that the position is current after stack has changed
* moved apps used in cards view test into a variable used to populate running apps as well as the stack
* removed old user ordering code (web os model task manager...) since it's incompatible with our new model
  and the code does not have any tests and it hasn't been enabled in a long time. We're moving on!
* detect cardsview being dismissed and re-enable edge gestures
* created a local help function to enable/disable edge gestures based on events received
* select currently active application card in cards view when cards view is shown
  if no active application, then default to stack position.
* cards view uses 'position' in stack internally, updated code to stop using old 'origin' name to avoid confusion.
* cards view now broadcasts 'newStackPosition' when it's closed and the stack position has changed. newStackPosition contains the position of the application that will be in the top of the stack.
* made edge swipe detector listen to 'cardviewclosed' with new fancy newStackPosition, this also prevents edge gestures from being re-enabled when we go back to the homescreen.
* made stack manager use newStackPosition to move application that was displayed from cards view to top of stack.
* fixed cards view unit tests
* prevent system app from appearing in the application history stack.
* updated 'runningApps' var name to 'stack' in cards view for clarity
* updated 'displayedApp' var name to 'currentPosition' in cards view for clarity
* added getter/setter for position in stack manager, with tests
* added getter/setter for lifecycleEnabled in edge gestures as well as tests for it's usage
* added test to stack manager to ensure that system app does not show up in stack
* alignCurrentCard after we remove one.
* fix gaia ui test.
* use 'position' getter/setter everywhere in StackManager.
* added test to ensure that internal _current position in StackManager doesn't accidentily become a string.

r=etienne
Bug 971625 - [settings] refactor marionette test for support panel
Bug 963010 - [NFC] When shrinking UI showed up, it will be strange when clicked on home button
[DSDS][Gaia][Sim Manager] support always ask feature

- add 'always ask' option
- add related unit test
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 957100 - [Settings] add marionette for b2g-improve and feedback page
Bug 975350 - [System] compress gUM image
Bug 901216 - [l10n.js] make consoleWarn string concatenation-free
Also updated consoleLog string concatenation-free