Merge "Add pre-send update support to DeferredUpdates"