Bug 1036030 - Correctly substitute inline html for l10n string placeholders. r=ferjm
Bug 1035718 - [FTU] - remove unused images
Bug 1039968 - [B2G][OTA] The icon order within pages is not preserved when there are collections
Bug 994571 - [System2] Remove the pattern to return self in start()

* Remove 'var module = new Module().start()' pattern.
* Remove 'return this;' expression in start() function definitions.
Bug 1022575 - Received SMS store (without text) on check balance. Listening "ondelete" event for the deleted threads. r=julien
Bug 1040091 - [v2.1] Fix imei issue in test_settings_device_info.py
Bug 1038671 - Ignore the hardware home button when the software one is enabled.
Bug 1034985 - Prevent switch notification to show up for inactive preloaded attention screens.
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 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.
Merge pull request #21857 from crdlc/bug-1039968

Bug 1039968 - [B2G][OTA] The icon order within pages is not preserved wh...
Bug 1039171 - Runtime decision on whether or not to run preload keyboard oop
Merge pull request #21776 from azasypkin/bug-1022575-on-delete-v2.0

 Bug 1022575 - Received SMS store (without text) on check balance. Listening "ondelete" event for the deleted threads. r=julien
Merge pull request #21734 from pivanov/bug-1035718

Bug 1035718 - [FTU] - remove unused images
Merge pull request #21603 from begeeben/994571_remove_the_pattern

Bug 994571 - [System2] Remove the pattern to return self in start(), r=alive
Revert "Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavailable" for breaking gaia unit tests

This reverts commit c602a44b7077670b50f6627e305cf149c594370d.
Merge pull request #21762 from etiennesegonzac/bug-1038671

Bug 1038671 - Ignore the hardware home button when the software one is enabled r=21
Merge pull request #21759 from etiennesegonzac/bug-1034985

Bug 1034985 - Prevent switch notification to show up for inactive preloaded attention screens r=21