Merge pull request #6967 from jflyper/bfdev-fix-add-USE_ESC_SENSOR-conditional-to...