Merge "Fixes ActivityLifecycleTests flakiness" into main