Merge "Initial attempt at jank-tracking stat collection"