Merge "Add a better getLastQueuedBuffer"