Merge "usb: gadget: f_mtp: Handle OS descriptors properly"