Merge "Fix the split divider position being shifted during animating" into udc-dev