Merge "Adding SurfaceEncoder for encoding FilterFrames"