Merge "Remove RemoteSurfaceTrace functionality."