Flint: fix loading initial layout

Fixes #2495 (closed)

This MR fixes a loading sequence to follow to make sure the layout is properly loaded.

Already part of the backport !3406 (merged)