Merge "Fix issue with animation handler deadlock"