LPS-48740 Ensure that all code modifying layouts occurs before these lay...

...outs are updated.