Merge "Set task corner radius to match spec" into main