Merge "Fix NumberFormatException in SipEditor when saving port number"