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 970340 - [Download Manager]A file with a size >1GB is not displayed successfully
Bug 972188 - Don't call pair() for incoming file transfers
Bug 965346 - Part 2: Update airplane mode status whenever _enabled flag is changed. r=alive
Bug 964342: Send language setting to basket.

* Add error codes to basket client.
* Use error code for invalid email instead of looking for a message.
* Add timeout handling for call to basket.
Bug 963445 - [UITest][API] refactor tests using Building Blocks
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 972788 : launch Browser after reading a NFC tag.
Bug 973828 - Resume the app when a system message access a suspending app
Bug 972277 - Making sure the statusbar is on the lockscreen when the active app is fullscreen.
r=timdream
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 964517 - Add solid background to apps where appropriate. r=alive
Bug 935342 - [Permission] video&Mic icon for prompt window
Bug 974246 - Find file in build_stage if it doesn't exist in app directory
Bug 974261 - Volume buttons stucks, need clearTimeout()
Bug 974283 - Fix intermittent failure of test_music_album_mp3.py
Bug 973593 - Address failure in test_cost_control_data_alert_mobile.py