Flipped if statements to fix state and flags changes in SensorCov
Merge branch 'SensorCov_conv' into test_branch