Merge "Make split screen only reparent top task" into sc-v2-dev