Merge "Use Layer IDs instead of handles in BufferCountTracker" into main