Merge "Use new Skia DrawShadow API"