Merge prior defconfig changes into next/defconfig