Merge "Enhancements to Audio Tap-to-Tone test." into sc-dev