Merge pull request #22022 from crdlc/bug-1041291

Bug 1041291 - [Vertical Homescreen] Load improvements for configurator.j...(cherry picked from commit e13f1f667a49160c3fa3eab89e189910c46b04dc)