Keep the High/low water marks the same for all platform

Hope this helps the sound delay issue #1883