Merge "Clear animations in DisplayLists when done" into jb-dev