fix: Consider flex elements in incremental layout (#1031)

fix: Consider flex elements in incremental layout (#1031) #2849