Merge "Fix ActivityEmbedding flicker test flakiness" into main