Merge "Add support of custom animation in ActivityEmbeddingController" into main