Merge "Fix flaky tests in ActivityTransitionTests" into sc-v2-dev