Merge "Allow a root activity to relinquish task identity"