Merge "Handle ActivityEmbedding container in remote transition adapter" into tm-qpr-dev