Merge "Fix ripple opacity to match the previous config." into tm-qpr-dev