Merge "Changed folder hover animations"