Merge "Docs: Fixing broken/incorrect links in Doze" into nyc-dev