Merge pull request #21964 from EverythingMe/1040618-migrate

Bug 1040618 - [B2G][OTA] Several issues opening smart collections migrat...(cherry picked from commit 7543ff483b844dd515bfaa6cd219b301047e445a)