Merge "Implementing new ActivityEmbeddingComponent APIs"