Merge "Fix VcnConfig garbage collection" into main