fix add-on store merge conflicts between #18816 and #18974
Fixes #18991
Fixes a bad merge conflict fix between #18816 and #18974
Summary of the issue:
add-on store cannot open
Description of user facing changes:
add-on store can open again
Description of developer facing changes:
none
Description of development approach:
fix merge conflict
Testing strategy:
add-on store can open again
