Merge "usb: gadget: Fix issue in config_desc with OS descriptor handling"