Merge "Fix error BufferQueue attaching flow." into oc-dev