Merge "Remove problematic sleeps in AnimatorTest"