Merge "Refactoring filter animation logic."