Merge "Ripple position of slider is incorrect" into sc-dev