Merge "Fix launcher crash and correct split behavior"