Checkpoint: Added flag checks inside navigation state update