Merge "Only override ActivityEmbedding animation for embedded activities" into tm-qpr-dev