[PATCH 4/4] Kconfig symbol cleanup for v5.5-rc1