Merge "Avoid texture path drawing for EdgeEffect"