Merge "Fix ActivityEmbedding Shell transition animation with reparent" into tm-qpr-dev