Merge "Update to different minWidth for testing 2x2" into sc-dev