Merge "Group ActivityEmbedding split by Task id" into tm-dev