Merge "[Module Sync] Always update states at end of batch"