Merge "Fix flakiness in FadeTransitionTest"