Merge "Add a usage note to 'CanonicalNamespaces' hook docs"