Merge "VDM display flags: replace the compat change with a flag." into main