nvda

fix add-on store merge conflicts between #18816 and #18974

#18992

Merged