Bug 1048902 - [Messages] fix small issue in the desktop mock r=azasypkin
Bug 1045701 - Part 2 [Homescreen] - Do not migrated un-initialized smart collections r=amirn
Merge pull request #22527 from julienw/fix-desktop-mock

 Bug 1048902 - [Messages] fix small issue in the desktop mock r=azasypkin
Merge pull request #22493 from KevinGrandon/bug_1045701_smart_collections_ota

Bug 1045701 - Part 2 [Homescreen] - Do not migrated un-initialized smart collections