Merge "Fix broken BufferHubQueueTest.TestRemoveBuffer" into pi-dev