Merge "Fix Paint Shader copy"