Merge "deferred: Improve DeferredUpdates test coverage"