Merge "SF: Remove display lookup in SurfaceTracing" into rvc-dev am: 0a4342395f am: bb8031158c

Change-Id: I5c0d3282dcc744214d4ec95402273a747bb82136