Merge branch '2023-09-30-Kconfig-updates' into next

- Migrate one symbol from CFG to CONFIG and move where another is.