Merge "Fix failing RippleShaderTest" into tm-qpr-dev