Merge "Fix first drag to split not working" into sc-v2-dev