Merge "Fix ActivityEmbedding animation flicker" into tm-qpr-dev