Merge "Add BlastBufferQueue adapter in SurfaceView"