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 973941 - Background image request follow-up r=amirn
Bug 974283 - Fix intermittent failure of test_music_album_mp3.py
Bug 973593 - Address failure in test_cost_control_data_alert_mobile.py
Bug 974361 - Memory average assumes the array of measurements always exists
Bug 962795 - Re-enable python e.me tests
Bug 974048 - Refine waits when connecting to a WiFi network
Bug 947617 - fixed clock hand transform to invoke the GPU
Bug 974858 - Make the lockscreen atom compatible with v1.3. r=zcampbell
[FTE] In FTE, when PIN is inserted, I can't see "Cellular data" screen instead i see "Select a network" screen
Bug 974855 - Strict or equal comparison when selecting picture size from pick activity

Doing a strict comparison fails on some devices (Peak, Nexus) and
crashes the device or the Camera app when attaching to send a MMS.
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 974376 - Marionnette JS tests are reported twice on Travis and locally.
Bug 960325 - Move Homescreen Background into Homescreen App. r=alive,
crdlc
Merge pull request #16372 from arcturus/bug-969293

[FTE] In FTE, when PIN is inserted, I can't see "Cellular data" screen instead i see "Select a network" screen
Bug 901216 - [l10n.js] make consoleWarn string concatenation-free
Also updated consoleLog string concatenation-free
Merge pull request #16420 from zacc/bug_974048

Bug 974048 - Refine waits when connecting to a WiFi network
Merge pull request #16452 from zacc/bug962795

Bug 962795 - Re-enable python e.me tests
Merge pull request #16444 from askeing/974283

Bug 974283 - Fix intermittent failure of test_music_album_mp3.py