Merge "Fix split dismissed after click pip to split button" into sc-v2-dev