Clear shipping transient on save

Closes #6723