Merge "Refactor logic in the enter() of WaitingForNextProbeState"