Merge "Fix animation timing problem"