Merge "Fix drop to enter split not working" into sc-v2-dev