Merge "RESTRICT AUTOMERGE - Allow ResolverActivity to relinquish task identity" into sc-v2-dev