Merge "BufferQueue no longer hardcodes buffer counts"