Merge "Add NS_MAIN to NamespaceInfo::$canonicalNames"