Merge "Refactored query function from SurfaceTexture into BufferQueue"