Merge "Default test setup to single column shade" into sc-v2-dev