Merge "Make ripple sparkles less prominent" into sc-dev