Merge "Add layout for 1x1 size, update 2x1" into sc-dev