am f5bcd887: Merge "Refactoring filter animation logic."

* commit 'f5bcd8876e54aea8f228266ded5d9de8e6cad821':
  Refactoring filter animation logic.