nvda

Add-on store: make state pickling safer for downgrading

#14868

Merged