Merge "Fix slider being at 0 on unlock" into sc-dev