Merge branch '2022-09-01-assorted-Kconfig-migrations' into next

- Assorted Kconfig migrations