Merge "Clear DeferredUpdates state via setUp()"