Merge "Clean up BufferHubQueue API and internal bookkeeping."