Clean up mode logic to facilitate merge.
Merge branch 'sensor_hil_fixedwing' into hil_attack