Merge "enable hardware drawing for clipShader" into main