Merge "Do not resample when frameTime is not available" into main