Stash away promises from save operation.  Have preview wait for those
promises to complete, if present.  Fixes #3478