Merge "Move frame history into jank tracker"