Merge "Move layouts" into sc-dev