Merge "Give animators more useful names in systrace"