Merge "Make deferred updates fully own their transaction rounds"