Fix duplicated adb_path during save
Fix client not dying
Fix locale selection when user locale is not en_US