Merge "Ensure video data is cleared if video trace is deleted"