Merge "Fix AnimationTest#testRunAccelerateAlpha" into jb-dev