Merge "Fix AnimationTest#testSetAnimationListener" into jb-dev