Merge "Fix null pointer exception if USBPort is removed"