refactor: merge m2 mdc and mat tokens#30748

andrewseguin merged 2 commits intoangular:mainangular/components:mainfrom

andrewseguin:remove-varsandrewseguin/components:remove-varsCopy head branch name to clipboard