Merge "Add shade radius to systraces" into sc-dev