Merge "Revert "usb: gadget: f_mtp: Handle mtp os desc properly""