Merge some betaflight changes into CF.