Merge "Adding a thumbnail scale down animation" into jb-mr1-dev