Merge "Fix wrong split bounds in legacy split flicker tests" into sc-dev