Merge "Revert^2 "Introduce library for public animation APIs"" into udc-dev