Adjust current_scale in fullscreen_image.py to return a list of the scale x, y rather than a string
Bug 1030819 - Move plivo requirement into the test's requirements file
Bug 1033973 - Update device testing to marionette client 0.7.11 a=testonly
Bug 1031430 - (2.0-visual-refresh)[Notifications and Alarms] - Add New Signature Firefox OS tone
Bug 1000839: Fixes and unit tests for NfcUtils.encodeNDEF()
 Bug 1027979 - Remove more dead code from keyboard app.
  - Remove the pendingSymbols relate code.
Bug 1030007 - Huge frame drops observed while zoom in/out during Video recording
Bug 967216 - Intermittent calendar/test/unit/app_test.js | app global events moztimechange | expected 2 to equal 1
Bug 1014454 - [Keyboard UX update][User Story] Visual update on the number keyboard
Bug 1032327 - [Settings] Fix unit tests with a newer mocha r=cctuan
Bug 1033365 - Header text in bookmarks activity is misaligned
Bug 1026955 - Resize and center headers according to Gecko's logic
Bug 1004973 - Unify MockL10n. r=julienw r=gandalf
Bug 1030448 - Also make the default lockscreen react to the 'lockscreen.lock-immediately' setting.
Bug 1032288 - Intermittent failing test, Vertical Home - Packaged App Update resume update, TypeError: entry.app.manifest is undefined r=crdlc
Merge pull request #21419 from KevinGrandon/bug_1032288_vertical_manifest_failure

Bug 1032288 - Intermittent failing test, Vertical Home - Packaged App Update resume update, TypeError: entry.app.manifest is undefined
Bug 990020 - [B2G][SMS] A MMS that has not been downloaded yet will display a "Missing SIM card" message after changing the SIM to a different valid one. r=julien
Merge pull request #21350 from zacc/bug_1033973

Bug 1033973 - Update device testing to marionette client 0.7.11 a=teston...
Merge pull request #19672 from cctuan/1014454

Bug 1014454 - [Keyboard UX update][User Story] Visual update on the number keyboard
Bug 982663: Part 1 - Collect and report app usage data. r=etienne

* record app installation and uninstallation
* send a unique device id with each report
* report deviceinfo, language and screen data, and make telemetry parameters
  configurable through settings
* Refactor to match system app module structure
* Unit tests and bug fixes
* Change strings in Settings and FTU apps to mention app usage data collection
* Address review comments
* Fix failing bootstrap tests