Merge "HostStubGen: Stub generation is now optional, etc" into main