Merge "HostStubGen: Prevent conflicting command line args" into main