Reapplying xamarin upload fix after it has been lost in CI rework cherry-pick