Merge "Teach JankTracker about new swap behaviors" into nyc-mr1-dev