Merge "Use extra_cfg for dependency resolution too." into main