Merge "Improve the BT settings audio device type strings" into main