Merge "don't return the current buffer from dequeueBuffer"