Merge "HostStubGen: Fix minor bug" into main