Implement server side location for the native devics
Fix the rediscovery issue for the native device