Merge "Fix enter/exit horizontal ActivityEmbedding split with Shell transition" into tm-qpr-dev