Merge "Fix a crash in TrustedOverlayHost" into main