Merge "Fixes OpenActivityEmbeddingSecondaryToSplitTest flakiness" into main