Merge "Clean up DeferredUpdates transaction handling"