Merge "Fix UsbPortStatus test" into main