Merge branch 'backport-3.28-visionOS' into visionOS