Merge "Ensure flicker split test activities handle resize" into main