Merge "Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView" into sc-v2-dev