Merge "SF: Propagate uniqueID when creating virtual displays" into main