Merge "Merge ConsumeAllLocked into ConsumeAll" into main