Remove finished flag from MapWhile
#68820
+32
−57
Merged