Merge "Spring neighboring tasks into place on task reflow after dismiss." into main