Merge "Fix launcher crash and correct split behavior" into sc-v2-dev