Merge changes Icb5ea78e,I1cf97299

* changes:
  Move more calls to the lib.
  Migrating some animation spec logic to shared lib