Merge "BufferQueue: fixed acquire operation"