Pulled code from Andrew's CL 7828885 for the Mac.
#jira none
#rb ben.marsh
[FYI] brandon.schaefer, andrew.grant
#ROBOMERGE-SOURCE: CL 11750877 in //UE4/Release-4.25/... via CL 11750986
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)
[CL 11776541 by michael sartain in Main branch]