Merge "Add SurfaceInterceptor initial implementation"