Merge "Keep the SkPaint used when creating a layer."