Merge "Have turbulence noise play together with ripple on UMO button click." into udc-dev