Port OSS consumption changes from OS PR !12826284#18853

DHowett merged 2 commits intomainmicrosoft/terminal:mainfrom

dev/duhowett/mirror-12826284microsoft/terminal:dev/duhowett/mirror-12826284Copy head branch name to clipboard