4.x
Merge pull request #23108 from crackwitz:issue-23107
Merge pull request #24136 from komakai:visionos_support