Merge "Add comments to the arguments passed to FrameTracker"