Merge "BufferQueue: simplify max buffer count handling" into jb-mr1-dev