Adding fix for losing the both the XID and Device ID when saving new
point.