Merge changes I591dac9b,I79abd2a7 into main

* changes:
  Set the target state during lookahead pass
  Don't cast ApproachMeasureScope as LookaheadScope