Merge "Fix layer damage and clipping for Text shadows" into nyc-dev