Merge "Handle split selection when animation is disabled" into sc-v2-dev