Merge "Fix 3165868: Fix stall in state machine logic in WaveView"