Merge ""Fix" DrawAllocation lint warning." into main