Merge "Split progress into raw and curved in RippleShader." into tm-qpr-dev