Fix regression in colour/fill scale name redirection#6642

teunbrand wants to merge 3 commits intotidyverse:maintidyverse/ggplot2:mainfrom

teunbrand:scale_name_regressionteunbrand/ggplot2:scale_name_regressionCopy head branch name to clipboard