Merge "Avoid instantiating VDM for default device+display context." into main