Latest changes working on Fx for Android.