Fix another problem in layout.

If an arrange pass causes measure invalidate, exit the arrange pass and
re-run the measure pass.