Update defconfig with deltas from merge