Merge "Set label for links to resolver activities." into nyc-dev