Merge "Play turbulence noise only when it triggers playing music." into udc-dev