Merge "Implement 2x2 layout and text resizing" into sc-dev