Merge "Add flicker test for ActivityEmbedding (1/n)"