am 98f69881: am 77d94957: Merge "Adding small animation features" into jb-mr2-dev

* commit '98f69881ce28fef261da45c7fbd7ee79e9b8d637':
  Adding small animation features