Merge "Fix a race in BufferQueue"