Merge branch '2022-07-08-Kconfig-migrations' into next

- Another small round of CONFIG migrations to Kconfig