Merge "Verify hierarchy change for cross-UID ActivityEmbedding" into tm-dev