Merge "Adding initial folder animation"