Merge "Fix a memory leak with pending jank classifications" into sc-dev