Merge "Fix RotationTest inheritance in ActivityEmbedding" into main