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