Merge "Adding small animation features" into jb-mr2-dev