Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev