Merge "Clean up already removed companion_transport_apis flag" into main