Merge "Migrate FrameTracker to use ST Jank information"