Merge "Add VDM internal API getDeviceIdForDisplayId" into main