Merge "Fix duplicated VSync tracing in SurfaceInterceptor"