Merge "Reset scoped session for upload jobs after deferred updates"