Merge "docs: fix broken links in Activity reference" into nyc-dev