Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed."