Bug 1050162 - [LockScreen] No SIM label when there is an incoming call
Bug 1052442 - [sms] We should never close the activity when viewing the message report. r=julien
Bug 1015295 - [Keyboard] Update to use gaia-header
Bug 1016816 - [CostControl] Update to use gaia-header
Merge pull request #22742 from yor-mozilla-com/gaia-header-keyboard

Bug 1015295 - [Keyboard] Update to use gaia-header
Bug 1020306 - Make the thread/message edit mode to match the style used by other applications r=gsvelto,julien
Bug 1040271 - [L10n][SMS] Clean up mozL10n.get uses in SMS app r=gandalf,azasypkin,julien
Bug 1035272 - [B2G][Homescreen] Entertainment smart collection icon is not migrated r=yurenju
Merge pull request #22850 from KevinGrandon/bug_1035272_default_entertainment_collection_icon

Bug 1035272 - [B2G][Homescreen] Entertainment smart collection icon is not migrated
Bug 1007774 - Part 2: fix undefined/null error found with hamachi.
Merge pull request #21941 from giovannic/smsbugfix2

Bug 1040271 - [L10n][SMS] Clean up mozL10n.get uses in SMS app
Merge pull request #22737 from gtorodelvalle/callscreen-bug-1050162-sim-label-when-lockscreen

Bug 1050162 - [LockScreen] No SIM label when there is an incoming call
bug 1049790 - Use one listener for moztimechange. r=fcampo
Merge pull request #22842 from wilsonpage/1016816

Bug 1016816 - [CostControl] Update to use gaia-header
Merge pull request #22803 from nullaus/bug1049790-master

bug 1049790 - Use one listener for moztimechange. r=fcampo
Merge pull request #22832 from azasypkin/bug-1052442-activity-information-panel

Bug 1052442 - [sms] We should never close the activity when viewing the message report. r=julien
Merge pull request #22893 from hfiguiere/bug1007774

Bug 1007774 - Part 2: fix undefined/null error found with hamachi. r=eli