Merge "Simplify ripple background drawing, fix ripple alphas" into lmp-dev