Merge "Clean up AnimationThread default handler"