Merge "Allow application level knownActivityEmbeddingCerts" into main