Merge "Reset batching state when overlap batch deletion occurs"