Merge "BufferQueue: fixed issues with buffer slots not available"