Merge "BufferHubQueue: ClearAvailable on consumer import"