Merge "Remove UMO ripple and turbulence noise flags" into main