Merge changes I64da9051,Idfaf9e90 into tm-qpr-dev

* changes:
  Bring animations up to spec
  Fix sizes in new header to spec