Merge "Separate initial layout from placeholder layout" into sc-dev