Merge "Refactored global state out of EnqueueableDataUpdate"