Merge "Change BufferQueue into producer/consumer wrapper"