Merge "Save remote device name immediately" into klp-wireless-dev