Merge "usb: gadget: Fix mismatched function wake notification"