Merge pull request #16131 from gabrielesvelto/bug-917193-tones-glitch-workaround

Bug 917193 - Use samples instead of waveform generators for short audible tones
(cherry picked from commit 3c2e748e4d57551527366eba00428a0f5ccc4012)