Merge "Fix NPE when creating mirror displays w/o VDM" into main