Merge "Animate ActivityEmbedding transition with Shell Transition" into tm-qpr-dev