Merge "Revert "Allow activity in ActivityEmbedding split to get Task windowing mode"" into tm-dev