Merge "Reparent remaining tasks to matching launch root when display removed"