Merge "Fix jank classification"