Fix up MacContent copy errors
Merge branch 'mac-x' into unified