Merge "Refactor ToggleSliderView"