Merge "BtHelper/SoundDoseHelper: fix misc error-prone warnings" into main