Rest Stop skill does not cancel when Thalassodromeus slides into water due to momentum

When Thalassodromeus activates Rest Stop, if it fails to stop fully from momentum and slides into the water, the Rest Stop skill continues running underwater until its full duration ends. I believe this behaviour is unintended. The skill should be cancelled immediately upon entering water.

Rest Stop keeps going while submerged and finishes the full timer

Rest Stop should automatically stop the moment the creature enters water