Merge "Only play ActivityEmbedding animation if there is AE split" into tm-qpr-dev