Merge "Fix the corner radius on workspace page outlines" into sc-dev