Merge pull request #20257 from KevinGrandon/bug_1022971_vertical_rename_all_the_things

Bug 1022971 - Rename Icon grid object to Mozapp
Bug 1022971 - Rename follow-up for merge conflicts r=me