Sync windows version with Android