Merge pull request #21857 from crdlc/bug-1039968

Bug 1039968 - [B2G][OTA] The icon order within pages is not preserved wh...(cherry picked from commit 9217c942888d34a02fd1402faa77a92d01246425)