Merge "Apply renames when determining whether a dependency is enabled." into main