Merge pull request #22850 from KevinGrandon/bug_1035272_default_entertainment_collection_icon

Bug 1035272 - [B2G][Homescreen] Entertainment smart collection icon is not migrated
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