Merge "Add test for regression in Animators" into udc-dev