Merge pull request #10481 from mikeller/fix_baro_sample_count_setting