Merge "Add a few trace points for animation loading." into nyc-mr1-dev