Bug 1020306 - Make the thread/message edit mode to match the style used by other applications r=gsvelto,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