Merge "Merge "Split progress into raw and curved in RippleShader." into tm-qpr-dev am: a7d9b7f96a am: e98a2bfb00"