Merge "Add shell transition handling for staged split-screen." into sc-dev