Merge "Fix ActivityLaunchAnimatorTest crash" into sc-dev