Merge "DMS: Avoid SurfaceControl query for display token"