Merge "Track: Check buffer size"