Merge "Fix the ActivityLifecycleTests#testLocalRecreate flakiness" into sc-dev