Merge "Fix deadlock in applyBatch."