Merge "BufferQueue: handle consumer driven size for pre-rotation"