Merge "Do not show display options for VC traces." into main