Update to latest FA for Xamarin support