Merge "Only reparent controlling tasks when entering split" into sc-dev