Merge "[CDM] Add trunk stable flags for companion transports" into main