Merge "Fix launching ActivityGroup with ActivityEmbedding" into tm-qpr-dev