Merge "Ripple mask shader not drawing properly" into tm-dev