Merge "Fix error BufferQueue attaching flow."