Merge "BufferQueue returns proper code on acquire"