Merge "HostStubGen: Fix direct outer class detection" into main