LPS-35075 Apply StagedModel pattern to Layouts