Merge "SF: Remove display lookup in SurfaceTracing" into rvc-dev