Merge "Update ActivityEmbedding Usage" into tm-qpr-dev-plus-aosp