LPS-35075 Apply new StagedModel pattern to Layouts