Merge "Add a better getLastQueuedBuffer" into sc-dev