Fix USB gadget regression of 6.7.0 by merging -stable. [ci:skip-build]: already built successfully in CI