Improve Facebook integration on Android

Improve Facebook integration on Android