Merge branch '2022-03-25-Kconfig-migrations' into next

- Merge a number of Kconfig migration patches