Merge "Adding animation when destroying folder due to single item remaining"