Better IMO to include such updates with the patch that reorganizes
that part of the menu ... it's conceptually a single change, and
fragmenting it will cause bisection problems.
In fact, moving the gadget Kconfig in a separate step would make
your main changes more clear too.
--