LPS-35074 Turning Layout to StagedModel

Re-sending since yesterday got closed, because some failed tests :)