Merge "Fix open ActivityEmbedding split with Shell transition" into tm-qpr-dev