Merge "Switch to USB_CONFIGURED as the primary USB readiness signal"