Merge "Update anim to spec" into pi-dev