Merge "Updated face session to use SurfaceView" into main