Merge "Fix shadow radius too large for RS" into nyc-dev