Merge "Revert back thick slider" into sc-dev