Bug 1028776 - The screen timeout do NOT reset if NFC do something when screen almost off (darker screen)
Bug 1036030 - Correctly substitute inline html for l10n string placeholders. r=ferjm
 [Keyboard][Pinyin] Switch back to default page instead of symbol panel
Bug 1030280 - Move SIMCard dialog from injecting textContent to setting data-l10n-id attributes.
Bug 1039948 - [System::StatusBar] Airplane mode icon update issues
Bug 1040091 - [v2.1] Fix imei issue in test_settings_device_info.py
Bug 1029721 - CDMA call waiting call is not logged in call history
Bug 1040342 - Follow up to bug 1039199 with tests
Bug 1028253 - Camera App memory regression in FxOS
Bug 1035062 - (Part I) Remove unused isContinousSpacePressed

remove unused variable
Bug 1035062 - (Part II) Move double tap monitoring to ActiveTargetsManager
Bug 1035062 - (Part III) Remove resetUpperCase()
Bug 1040070 - [Verical Homescreen] Use smaller images sizes for low capability devices r=crdlc

The following changes are made for low capability devices:

* Icons default to 4 per row.
* Icon resolution is reduced.
* Icon rendering does not account for devicePixelRatio.
Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavailable
Bug 1038616 - [Dialer] Busy tone not playing
Merge pull request #21638 from tamarahills/bugfix/1029721

Gaia fix for placing cdma call waiting call in the call log r=gsvelto
bug 1038167 - Update icons for Find My Device, Vertical Homescreen, Smart Collection and System App
Merge pull request #21834 from KevinGrandon/bug_1029902_low_memory_features

Bug 1029902 - [Vertical Homescreen] Implement device capability configuration
Bug 1031998 - Fix jshint error for build/config/payment-dev-prefs.js
Merge pull request #21874 from chirarobert/fix_imei_test

Bug 1040091 - [v2.1] Fix imei issue in test_settings_device_info.py