Merge "Use small corner radius for roundness updates from shelf" into sc-dev