Merge "Fix potential memory leak of FrameTracker" into sc-dev